From 8204ae75d970308abde5c2c11b44a7255a8367a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Tue, 2 Sep 2025 21:44:45 +0800
Subject: [PATCH] =?UTF-8?q?feat(user):=20=E5=A2=9E=E5=8A=A0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 UserImportParam 类中添加了用户编码、公司 ID、地址和积分字段- 在用户导入示例中增加了这些新字段的数据
- 在创建新用户时，增加了这些字段的设置
---
 .../common/system/controller/UserController.java     |  8 ++++++++
 .../common/system/param/UserImportParam.java         | 12 ++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/src/main/java/com/gxwebsoft/common/system/controller/UserController.java b/src/main/java/com/gxwebsoft/common/system/controller/UserController.java
index 0928d71..2128a43 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/UserController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/UserController.java
@@ -473,12 +473,16 @@ public class UserController extends BaseController {
                 User u = new User();
                 u.setStatus(0);
                 u.setUsername(one.getUsername());
+                u.setUserCode(one.getUserCode());
                 u.setPassword(userService.encodePassword(one.getPassword()));
                 u.setNickname(one.getNickname());
                 u.setRealName(one.getRealName());
                 u.setPhone(one.getPhone());
+                u.setPoints(one.getPoints());
                 u.setEmail(one.getEmail());
+                u.setAddress(one.getAddress());
                 u.setComments(one.getComments());
+                u.setCompanyId(one.getCompanyId());
 
                 // 设置角色（如果提供）
                 if (one.getRoleName() != null && !one.getRoleName().trim().isEmpty()) {
@@ -591,10 +595,12 @@ public class UserController extends BaseController {
             example1.setNickname("管理员");
             example1.setRealName("张三");
             example1.setPhone("13800138001");
+            example1.setPoints(1000);
             example1.setEmail("admin@example.com");
             example1.setOrganizationName("总公司");
             example1.setSexName("男");
             example1.setRoleName("管理员");
+            example1.setAddress("地址");
             example1.setComments("");
             templateData.add(example1);
 
@@ -604,10 +610,12 @@ public class UserController extends BaseController {
             example2.setNickname("注册用户");
             example2.setRealName("李四");
             example2.setPhone("13800138002");
+            example1.setPoints(2000);
             example2.setEmail("user@example.com");
             example2.setOrganizationName("分公司");
             example2.setSexName("女");
             example2.setRoleName("注册用户");
+            example2.setAddress("地址");
             example2.setComments("");
             templateData.add(example2);
 
diff --git a/src/main/java/com/gxwebsoft/common/system/param/UserImportParam.java b/src/main/java/com/gxwebsoft/common/system/param/UserImportParam.java
index c73cdc9..054a253 100644
--- a/src/main/java/com/gxwebsoft/common/system/param/UserImportParam.java
+++ b/src/main/java/com/gxwebsoft/common/system/param/UserImportParam.java
@@ -45,4 +45,16 @@ public class UserImportParam implements Serializable {
     @Excel(name = "备注")
     private String comments;
 
+    @Excel(name = "用户编码")
+    private String userCode;
+
+    @Excel(name = "公司ID")
+    private Integer companyId;
+
+    @Excel(name = "地址")
+    private String address;
+
+    @Excel(name = "积分")
+    private Integer points;
+
 }