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; + }