diff --git a/search-tool/src/main/java/com/bonus/tool/dto/TbKeyPeopleVo.java b/search-tool/src/main/java/com/bonus/tool/dto/TbKeyPeopleVo.java index 0786628..e7a2066 100644 --- a/search-tool/src/main/java/com/bonus/tool/dto/TbKeyPeopleVo.java +++ b/search-tool/src/main/java/com/bonus/tool/dto/TbKeyPeopleVo.java @@ -69,31 +69,31 @@ public class TbKeyPeopleVo { /** * 专业 */ - @Excel(name = "专业", sort = 11) + @Excel(name = "专业", sort = 8) private String major; /** * 资格证书 */ - @Excel(name = "资格证书", sort = 8) + //@Excel(name = "资格证书", sort = 8) private String diploma; /** * 证书编号 */ - @Excel(name = "证书编号", sort = 10) + //@Excel(name = "证书编号", sort = 10) private String diplomaNum; /** * 级别 */ - @Excel(name = "级别", sort = 9) + //@Excel(name = "级别", sort = 9) private String level; /** * 养老保险是否正常 0 正常 1异常 */ - @Excel(name = "养老保险", sort = 9, readConverterExp = "0=正常,1=异常") + //@Excel(name = "养老保险", sort = 9, readConverterExp = "0=正常,1=异常") private String isNormal; diff --git a/search-tool/src/main/java/com/bonus/tool/dto/TbOtherPeopleVo.java b/search-tool/src/main/java/com/bonus/tool/dto/TbOtherPeopleVo.java index e7939f2..592b6a7 100644 --- a/search-tool/src/main/java/com/bonus/tool/dto/TbOtherPeopleVo.java +++ b/search-tool/src/main/java/com/bonus/tool/dto/TbOtherPeopleVo.java @@ -44,7 +44,7 @@ public class TbOtherPeopleVo { /** * 职工类型 */ - @Excel(name = "职工类型", sort = 10, readConverterExp = "1=正式职工,2=劳务派遣") + @Excel(name = "职工类型", sort = 7, readConverterExp = "1=正式职工,2=劳务派遣") private String workType; /** @@ -57,31 +57,31 @@ public class TbOtherPeopleVo { /** * 专业 */ - @Excel(name = "专业", sort = 8) + @Excel(name = "专业", sort = 6) private String major; /** * 资格证书 */ - @Excel(name = "资格证书", sort = 5) + //@Excel(name = "资格证书", sort = 5) private String diploma; /** * 证书编号 */ - @Excel(name = "证书编号", sort = 7) + @Excel(name = "证书编号", sort = 5) private String diplomaNum; /** * 级别 */ - @Excel(name = "级别", sort = 6) + //@Excel(name = "级别", sort = 6) private String level; /** * 养老保险是否正常 0 正常 1异常 */ - @Excel(name = "养老保险", sort = 9, readConverterExp = "0=正常,1=异常") + //@Excel(name = "养老保险", sort = 9, readConverterExp = "0=正常,1=异常") private String isNormal;