From 9748f3f74f9f5d49d23528e9005bd82577591992 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 10 四月 2024 18:24:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/dao/business/dto/MemberImport.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 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 3b10169..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
@@ -15,27 +15,32 @@
@ApiModel("鍛樺伐淇℃伅瀵煎叆")
public class MemberImport {
+ @ExcelColumn(name="搴忓彿",value = "sn")
+ private Integer sn;
+
@ExcelColumn(name="濮撳悕",value = "name")
private String name;
- @ExcelColumn(name="韬唤璇佸彿鐮�",value = "idCard")
+ @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 duId;
+
@ApiModelProperty(value = "鎵�灞炲伐绉嶄富閿�")
- private Integer workTypeId;
+ private Integer worktypeId;
- @ApiModelProperty(value = "娲鹃仯鍗曚綅鍚嶇О")
- private String duName;
-
- @ApiModelProperty(value = "鎵�灞炲伐绉嶅悕绉�")
- private String workTypeName;
}
--
Gitblit v1.9.3