From ce5f8a87bb5d411bae67c39b269d879677bb98da Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 08 十一月 2026 19:29:25 +0800
Subject: [PATCH] feat(hrm): 请假导入、加班代申请、批量排班与考勤应出勤重算
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmEmployeeSocialSecurityRespVO.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmEmployeeSocialSecurityRespVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmEmployeeSocialSecurityRespVO.java
index 69e7e6e..50c8e8e 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmEmployeeSocialSecurityRespVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmEmployeeSocialSecurityRespVO.java
@@ -7,18 +7,15 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
-@Schema(description = "绠＄悊鍚庡彴 - 鍛樺伐绀句繚鍏Н閲戞。妗� Response VO")
+@Schema(description = "绠＄悊鍚庡彴 - 閮ㄩ棬绀句繚鍏Н閲戞。妗� Response VO")
@Data
public class HrmEmployeeSocialSecurityRespVO {
@Schema(description = "妗ｆID", example = "1")
private Long id;
- @Schema(description = "绯荤粺鐢ㄦ埛ID锛堝叧鑱� system_users.id锛�", example = "100")
- private Long userId;
-
- @Schema(description = "鍛樺伐濮撳悕", example = "寮犱笁")
- private String userName;
+ @Schema(description = "閮ㄩ棬ID锛堝叧鑱� system_dept.id锛�", example = "119")
+ private Long deptId;
@Schema(description = "閮ㄩ棬鍚嶇О", example = "鐮斿彂閮�")
private String deptName;
@@ -29,7 +26,7 @@
@Schema(description = "绀句繚鍏Н閲戞柟妗堝悕绉�", example = "2024骞村崡閫氬競鏍囧噯")
private String schemeName;
- // ========== 缂寸撼鍩烘暟锛堝憳宸ヤ釜鎬у寲璁剧疆锛� ==========
+ // ========== 缂寸撼鍩烘暟锛堟寜閮ㄩ棬璁剧疆锛� ==========
@Schema(description = "绀句繚缂寸撼鍩烘暟", example = "10000")
private BigDecimal socialSecurityBase;
--
Gitblit v1.9.3