This commit is contained in:
Paidax
2025-09-25 14:32:23 +08:00
parent b210758ee8
commit 4ef59d727a
103 changed files with 232 additions and 194 deletions
@@ -130,7 +130,7 @@ public class BenefitUserController {
exportEntities.add(new ExcelExportEntity("工号", "loginName", 20));
exportEntities.add(new ExcelExportEntity("姓名", "userName", 20));
exportEntities.add(new ExcelExportEntity("性别", "sex", 20));
exportEntities.add(new ExcelExportEntity("人员类别", "personType", 20));
exportEntities.add(new ExcelExportEntity("教职工类别", "personType", 20));
exportEntities.add(new ExcelExportEntity("在职状态", "userState", 20));
exportEntities.add(new ExcelExportEntity("所在分工会", "unionName", 20));
exportEntities.add(new ExcelExportEntity("所在部门", "unitName", 20));
@@ -70,7 +70,7 @@ public class BenefitUserSelectionListController {
exportEntities.add(new ExcelExportEntity("工号", "loginName", 20));
exportEntities.add(new ExcelExportEntity("姓名", "userName", 20));
exportEntities.add(new ExcelExportEntity("性别", "sex", 20));
exportEntities.add(new ExcelExportEntity("人员类别", "personType", 20));
exportEntities.add(new ExcelExportEntity("教职工类别", "personType", 20));
exportEntities.add(new ExcelExportEntity("在职状态", "userState", 20));
exportEntities.add(new ExcelExportEntity("所在分工会", "unionName", 20));
exportEntities.add(new ExcelExportEntity("所在部门", "unitName", 20));
@@ -57,7 +57,7 @@ public class BenefitUser extends BaseModel {
private String unionId;
@Column
@Comment("人员类型")
@Comment("教职工类别")
@ColDefine(type = ColType.VARCHAR)
private String personType;