diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/sys/convert/RegionConverter.java b/pmapi/src/main/java/com/ningdatech/pmapi/sys/convert/RegionConverter.java index 2ce9a08..f1f9908 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/sys/convert/RegionConverter.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/sys/convert/RegionConverter.java @@ -26,7 +26,7 @@ public class RegionConverter { public static RegionDTO toRegionDTO(Region region) { RegionDTO dto = new RegionDTO(); dto.setRegionLevel(region.getRegionLevel()); - dto.setRegionName(region.getName()); + dto.setRegionName(region.getRegionName()); dto.setParentCode(region.getParentCode()); dto.setRegionCode(region.getRegionCode()); dto.setId(region.getId()); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/sys/model/entity/Region.java b/pmapi/src/main/java/com/ningdatech/pmapi/sys/model/entity/Region.java index dc97b52..2dc9afa 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/sys/model/entity/Region.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/sys/model/entity/Region.java @@ -27,7 +27,7 @@ public class Region implements Serializable { private String regionCode; - private String name; + private String regionName; private Integer regionLevel; @@ -37,10 +37,6 @@ public class Region implements Serializable { private Long parentId; - private LocalDateTime createOn; - - private LocalDateTime updateOn; - private String regionCodePath; private Boolean deleted;