From c77086ad2d7949ab36dd0c4e0b59907e672dd64f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 18 九月 2026 15:04:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev_pro2.0' into dev_宁夏_九泓化工

---
 src/api/hrm/salary/calculation/index.ts |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/api/hrm/salary/calculation/index.ts b/src/api/hrm/salary/calculation/index.ts
index 4aa6f4c..76d4fdd 100644
--- a/src/api/hrm/salary/calculation/index.ts
+++ b/src/api/hrm/salary/calculation/index.ts
@@ -26,6 +26,8 @@
     actualSalary?: number;
     workDays?: number;
     overtimeHours?: number;
+    /** 鎺掔彮鎬诲伐鏃讹紙灏忔椂锛� */
+    totalWorkHours?: number;
     status?: number;
     statusName?: string;
     remark?: string;

--
Gitblit v1.9.3