diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Region.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Region.java index 08bc072b..707a4ae6 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Region.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Region.java @@ -112,7 +112,7 @@ public class Region implements Serializable { * 层级 */ @ApiModelProperty(value = "层级") - private Integer level; + private Integer regionLevel; /** * 排序 */ diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/excel/RegionExcel.java b/blade-service/blade-system/src/main/java/org/springblade/system/excel/RegionExcel.java index 03c3f82a..a3b78e57 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/excel/RegionExcel.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/excel/RegionExcel.java @@ -79,7 +79,7 @@ public class RegionExcel implements Serializable { private String villageName; @ExcelProperty("层级") - private Integer level; + private Integer regionLevel; @ExcelProperty("排序") private Integer sort; diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RegionMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RegionMapper.xml index 89f40d9c..285df4ab 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RegionMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RegionMapper.xml @@ -18,7 +18,7 @@ - + @@ -38,7 +38,7 @@ - + diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RegionServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RegionServiceImpl.java index 348d8551..48bc391e 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RegionServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RegionServiceImpl.java @@ -58,7 +58,7 @@ public class RegionServiceImpl extends ServiceImpl impleme region.setAncestors(ancestors); } // 设置省、市、区、镇、村 - Integer level = region.getLevel(); + Integer level = region.getRegionLevel(); String code = region.getCode(); String name = region.getName(); if (level == PROVINCE_LEVEL) {