From 5f612ab2f67b2c6f6894c624a7780799526d566d Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 05 十一月 2026 20:20:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business_新高电力' into dev_business_新高电力
---
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserImportExcelVO.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserImportExcelVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserImportExcelVO.java
index f6400e1..eb24978 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserImportExcelVO.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserImportExcelVO.java
@@ -24,8 +24,8 @@
@ExcelProperty("鐢ㄦ埛鍚嶇О")
private String nickname;
- @ExcelProperty("閮ㄩ棬缂栧彿")
- private Long deptId;
+ @ExcelProperty("閮ㄩ棬鍚嶇О")
+ private String deptName;
@ExcelProperty("鐢ㄦ埛閭")
private String email;
@@ -33,6 +33,9 @@
@ExcelProperty("鎵嬫満鍙风爜")
private String mobile;
+ @ExcelProperty("鍒濆瀵嗙爜")
+ private String password;
+
@ExcelProperty(value = "鐢ㄦ埛鎬у埆", converter = DictConvert.class)
@DictFormat(DictTypeConstants.USER_SEX)
private Integer sex;
--
Gitblit v1.9.3