修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourceDto.java

@@ -65,8 +65,8 @@ public class WaterResourceDto extends BaseDto {
     @ApiModelProperty(value = "管理单位id")
     private Long managementUnitId;
 
-    @ExplicitConstraint(indexNum = 5, sourceClass = CommonExplicitConstraint.class, method = "getCompanyList")
-    @ExcelProperty(value = "管理单位", index = 5)
+    @ExplicitConstraint(indexNum = 9, sourceClass = CommonExplicitConstraint.class, method = "getCompanyList")
+    @ExcelProperty(value = "管理单位", index = 9)
     @ApiModelProperty(value = "管理单位")
     private String managementUnit;
 
@@ -74,8 +74,8 @@ public class WaterResourceDto extends BaseDto {
     @ApiModelProperty(value = "维保单位id")
     private Long maintenanceUnitId;
 
-    @ExplicitConstraint(indexNum = 6, sourceClass = CommonExplicitConstraint.class, method = "getCompanyList")
-    @ExcelProperty(value = "维保单位", index = 6)
+    @ExplicitConstraint(indexNum = 10, sourceClass = CommonExplicitConstraint.class, method = "getCompanyList")
+    @ExcelProperty(value = "维保单位", index = 10)
     @ApiModelProperty(value = "维保单位")
     private String maintenanceUnit;
 
@@ -103,11 +103,11 @@ public class WaterResourceDto extends BaseDto {
     @ApiModelProperty(value = "实景图")
     private String realityImg;
 
-    @ExcelProperty(value = "联系人姓名", index = 9)
+    @ExcelProperty(value = "联系人姓名", index = 41)
     @ApiModelProperty(value = "联系人姓名")
     private String contactUser;
 
-    @ExcelProperty(value = "联系人电话", index = 10)
+    @ExcelProperty(value = "联系人电话", index = 42)
     @ApiModelProperty(value = "联系人电话")
     private String contactPhone;
 
@@ -305,8 +305,8 @@ public class WaterResourceDto extends BaseDto {
     private Long equipId;
 
     @ApiModelProperty("设施定义名称")
-    @ExcelProperty(value = "设施定义名称", index = 41)
-    @ExplicitConstraint(indexNum = 41, sourceClass = CommonExplicitConstraint.class, method = "getEquipDefinition")
+    @ExcelProperty(value = "设施定义名称", index = 5)
+    @ExplicitConstraint(indexNum = 5, sourceClass = CommonExplicitConstraint.class, method = "getEquipDefinition")
     private String equipName;
 
     @ExcelIgnore
@@ -324,7 +324,7 @@ public class WaterResourceDto extends BaseDto {
     private String equipCode;
 
     @ApiModelProperty("维保周期")
-    @ExcelProperty(value = "维保周期(月)", index = 42)
+    @ExcelProperty(value = "维保周期(月)", index = 6)
     private String maintenancePeriod;