From 50fb58286ed3b718c39a97e0987ee7561a295651 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 04 七月 2025 17:56:41 +0800
Subject: [PATCH] git ch

---
 server/service/src/main/java/com/doumee/dao/business/dto/MemberImport.java |   37 ++++++++++++++++++++++---------------
 1 files changed, 22 insertions(+), 15 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..30cf01e 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
@@ -6,6 +6,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * 鍛樺伐淇℃伅瀵煎叆琛�
  * @author 姹熻箘韫�
@@ -15,30 +17,35 @@
 @ApiModel("鍛樺伐淇℃伅瀵煎叆")
 public class MemberImport {
 
-    @ExcelColumn(name="搴忓彿",value = "sn")
+    @ExcelColumn(name="搴忓彿",value = "sn"  ,index = 1)
     private Integer sn;
 
-    @ExcelColumn(name="濮撳悕",value = "name")
+    @ExcelColumn(name="濮撳悕",value = "name"  ,index = 2)
     private String name;
 
-    @ExcelColumn(name="韬唤璇佸彿",value = "idCard")
+    @ExcelColumn(name="韬唤璇佸彿",value = "idCard"  ,index = 3)
     private String idCard;
 
-    @ExcelColumn(name="骞撮緞",value = "age")
-    private Integer age;
+    @ExcelColumn(name="娲鹃仯鍗曚綅" , value = "duName" ,index = 4)
+    private String duName;
 
-//    @ApiModelProperty(value = "娲鹃仯鍗曚綅涓婚敭")
-//    private Integer duId;
+    @ExcelColumn(name="宸ョ" , value = "workTypeName" ,index = 5)
+    private String workTypeName;
+
+    @ExcelColumn(name="澶囨敞",value = "澶囨敞" ,index = 6)
+    private String remark;
+
+    @ApiModelProperty(name="骞撮緞",value = "age")
+    private Integer age;
 
     @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