From 5db13c2ad6678cf4614b81c95df035c6f47d313d Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 16 十月 2026 21:57:36 +0800
Subject: [PATCH] feat(hrm): 考勤规则放开部门唯一限制,支持同一部门多班次
---
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserImportExcelVO.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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..be34e16 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
@@ -11,6 +11,9 @@
/**
* 鐢ㄦ埛 Excel 瀵煎叆 VO
+ *
+ * 鍒楀悕涓庨〉闈笂鐨勫彨娉曚繚鎸佷竴鑷达紙鐢ㄦ埛璐﹀彿 / 鐢ㄦ埛鏄电О锛夛紝閬垮厤鐢ㄦ埛鎷垮埌妯℃澘鍚庢壘涓嶅埌瀵瑰簲鍒椼��
+ * 閮ㄩ棬銆佸矖浣嶄袱鍒楀~銆屽悕绉般�嶅嵆鍙紙閮ㄩ棬涔熷彲浠ョ户缁~閮ㄩ棬缂栧彿锛夛紝瀵煎叆鏃朵細鍦ㄧ郴缁熼噷缈昏瘧鎴愮紪鍙枫��
*/
@Data
@Builder
@@ -18,14 +21,17 @@
@NoArgsConstructor
public class UserImportExcelVO {
- @ExcelProperty("鐧诲綍鍚嶇О")
+ @ExcelProperty("鐢ㄦ埛璐﹀彿")
private String username;
- @ExcelProperty("鐢ㄦ埛鍚嶇О")
+ @ExcelProperty("鐢ㄦ埛鏄电О")
private String nickname;
- @ExcelProperty("閮ㄩ棬缂栧彿")
- private Long deptId;
+ @ExcelProperty("閮ㄩ棬")
+ private String dept;
+
+ @ExcelProperty("宀椾綅")
+ private String post;
@ExcelProperty("鐢ㄦ埛閭")
private String email;
@@ -41,4 +47,7 @@
@DictFormat(DictTypeConstants.COMMON_STATUS)
private Integer status;
+ @ExcelProperty("鍒濆瀵嗙爜")
+ private String password;
+
}
--
Gitblit v1.9.3