diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisRegionController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisRegionController.java index f00b41ffc..5d23ef843 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisRegionController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisRegionController.java @@ -53,11 +53,10 @@ public class EmisRegionController extends BaseController */ @PreAuthorize("@ss.hasPermi('emis:emisRegion:list')") @GetMapping("/list") - public TableDataInfo list(EmisRegion emisRegion) + public AjaxResult list(EmisRegion emisRegion) { - startPage(); List list = emisRegionService.selectEmisRegionList(emisRegion); - return getDataTable(list); + return AjaxResult.success(list); } /** diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisRegion.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisRegion.java index d5c66994f..7ddcacd95 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisRegion.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisRegion.java @@ -1,10 +1,10 @@ -/** +/** * @Project: emis * @Title: EmisRegion.java * @author linfso - * @date 2023-11-16 16:18:40 + * @date 2023-12-13 05:49:14 * @Copyright: ShangHai Duta 2022 All rights reserved. - * @version v1.0 + * @version v1.0 * @Description:

四级省市区镇表 实体类

*/ @@ -25,9 +25,9 @@ import lombok.Data; * @ClassName EmisRegion * @Description 四级省市区镇表 * @author linfso - * @date 2023-11-16 16:18:40 + * @date 2023-12-13 05:49:14 */ - @Data +@Data public class EmisRegion extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/emis-biz/src/main/resources/mapper/EmisRegionMapper.xml b/emis-biz/src/main/resources/mapper/EmisRegionMapper.xml index 8b1017cc7..2fafc7df6 100644 --- a/emis-biz/src/main/resources/mapper/EmisRegionMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisRegionMapper.xml @@ -1,9 +1,9 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + insert into emis_region @@ -87,7 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" area_name, country_code, country_name, - + #{id}, #{regionName}, @@ -109,7 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{areaName}, #{countryCode}, #{countryName}, - + @@ -143,7 +143,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from emis_region where id in + delete from emis_region where id in #{id}