From af9932d1d6fe3bd56799dcd8b4d76dc993c5c1db Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 19 六月 2024 09:42:36 +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 | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 caf1c85..4e56900 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,13 +15,13 @@
@ApiModel("鍛樺伐淇℃伅瀵煎叆")
public class MemberImport {
- @ExcelColumn(name="搴忓彿",value = "sn")
+ @ExcelColumn(name="搴忓彿",value = "sn" )
private Integer sn;
- @ExcelColumn(name="濮撳悕",value = "name")
+ @ExcelColumn(name="濮撳悕",value = "name" )
private String name;
- @ExcelColumn(name="韬唤璇佸彿",value = "idCard")
+ @ExcelColumn(name="韬唤璇佸彿",value = "idCard" )
private String idCard;
@ExcelColumn(name="娲鹃仯鍗曚綅" , value = "duName")
@@ -30,8 +30,10 @@
@ExcelColumn(name="宸ョ" , value = "workTypeName")
private String workTypeName;
+ @ExcelColumn(name="澶囨敞",value = "澶囨敞")
+ private String remark;
- @ExcelColumn(name="骞撮緞",value = "age")
+ @ApiModelProperty(name="骞撮緞",value = "age")
private Integer age;
@ApiModelProperty(value = "鎬у埆")
--
Gitblit v1.9.3