修改列标冲突

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

@@ -181,72 +181,72 @@ public class FirefightersExcelDto extends BaseDto {
     private Long firefightersId;
 	/*************************岗位职级***********************/
     @ApiModelProperty(value = "员工层级")
-    @ExcelProperty(value = "员工层级", index = 20)
-    @ExplicitConstraint(type = "YGCJ", indexNum = 20, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "员工层级", index = 22)
+    @ExplicitConstraint(type = "YGCJ", indexNum = 22, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
     private String employeeHierarchy;
 
     @ApiModelProperty(value = "行政职务")
-    @ExplicitConstraint(type = "XZZW", indexNum = 21, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "行政职务", index = 21)
+    @ExplicitConstraint(type = "XZZW", indexNum = 23, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "行政职务", index = 23)
     private String administrativePosition;
 
     @ApiModelProperty(value = "岗位资质")
-    @ExplicitConstraint(type = "GWZZ", indexNum = 22, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "岗位资质", index = 22)
+    @ExplicitConstraint(type = "GWZZ", indexNum = 24, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "岗位资质", index = 24)
     private String postQualification;
 
     @ApiModelProperty(value = "消防救援人员类别")
-    @ExplicitConstraint(type = "XFRYLB", indexNum = 23, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "消防救援人员类别", index = 23)
+    @ExplicitConstraint(type = "XFRYLB", indexNum = 25, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "消防救援人员类别", index = 25)
     private String category;
 
 //    @ApiModelProperty(value = "消防救援人员状态")
 //    private String state;
 
     @ApiModelProperty(value = "消防救援衔级别代码")
-    @ExplicitConstraint(type = "XFJYJB", indexNum = 24, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "消防救援衔级别代码", index = 24)
+    @ExplicitConstraint(type = "XFJYJB", indexNum = 26, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "消防救援衔级别代码", index = 26)
     private String level;
 
     @ApiModelProperty(value = "消防专家领域")
-    @ExplicitConstraint(type = "ZJLY", indexNum = 25, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "消防专家领域", index = 25)
+    @ExplicitConstraint(type = "ZJLY", indexNum = 27, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "消防专家领域", index = 27)
     private String areasExpertise;
     
     /*************************学历教育***********************/
     @ApiModelProperty(value = "第一学历")
-    @ExplicitConstraint(type = "XLLX", indexNum = 26, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "第一学历", index = 26)
+    @ExplicitConstraint(type = "XLLX", indexNum = 28, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "第一学历", index = 28)
     private String firstDegree;
 
     @ApiModelProperty(value = "最高学历")
-    @ExplicitConstraint(type = "XLLX", indexNum = 27, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "最高学历", index = 27)
+    @ExplicitConstraint(type = "XLLX", indexNum = 29, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "最高学历", index = 29)
     private String highestEducation;
 
     @ApiModelProperty(value = "学位")
-    @ExplicitConstraint(type = "XWLX", indexNum = 28, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "学位", index = 28)
+    @ExplicitConstraint(type = "XWLX", indexNum = 30, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "学位", index = 30)
     private String academicDegree;
 
     @ApiModelProperty(value = "毕业院校")
-    @ExcelProperty(value = "毕业院校", index = 29)
+    @ExcelProperty(value = "毕业院校", index = 31)
     private String school;
 
     @ApiModelProperty(value = "毕业专业名称")
-    @ExcelProperty(value = "毕业专业名称", index = 30)
+    @ExcelProperty(value = "毕业专业名称", index = 32)
     private String professionalName;
 
     
     /*************************工作履历岗***********************/
     @ApiModelProperty(value = "参加工作时间")
-    @ExcelProperty(value = "参加工作时间", index = 31)
+    @ExcelProperty(value = "参加工作时间", index = 33)
 	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Date workingHours;
 
 	@ApiModelProperty(value = "参加消防部门工作时间")
-	 @ExcelProperty(value = "参加消防部门工作时间", index = 32)
+	 @ExcelProperty(value = "参加消防部门工作时间", index = 34)
 	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Date fireWorkingHours;