From 2e1ac74716f62ca5712d0187cb7d7d25ee13efe5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 05 三月 2024 14:34:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/dao/business/dto/MemberImport.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/dto/MemberImport.java b/server/service/src/main/java/com/doumee/dao/business/dto/MemberImport.java
index e8ed9c6..caf1c85 100644
--- a/server/service/src/main/java/com/doumee/dao/business/dto/MemberImport.java
+++ b/server/service/src/main/java/com/doumee/dao/business/dto/MemberImport.java
@@ -24,21 +24,23 @@
@ExcelColumn(name="韬唤璇佸彿",value = "idCard")
private String idCard;
+ @ExcelColumn(name="娲鹃仯鍗曚綅" , value = "duName")
+ private String duName;
+
+ @ExcelColumn(name="宸ョ" , value = "workTypeName")
+ private String workTypeName;
+
+
@ExcelColumn(name="骞撮緞",value = "age")
private Integer age;
-
-// @ApiModelProperty(value = "娲鹃仯鍗曚綅涓婚敭")
-// private Integer duId;
@ApiModelProperty(value = "鎬у埆")
private Integer sex;
-// @ApiModelProperty(value = "鎵�灞炲伐绉嶄富閿�")
-// private Integer workTypeId;
-//
-// @ApiModelProperty(value = "娲鹃仯鍗曚綅鍚嶇О")
-// private String duName;
-//
-// @ApiModelProperty(value = "鎵�灞炲伐绉嶅悕绉�")
-// private String workTypeName;
+ @ApiModelProperty(value = "娲鹃仯鍗曚綅涓婚敭")
+ private Integer duId;
+
+ @ApiModelProperty(value = "鎵�灞炲伐绉嶄富閿�")
+ private Integer worktypeId;
+
}
--
Gitblit v1.9.3