From 44840942aba889088a86d2b3d93856530bb2dc25 Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期二, 25 八月 2026 16:51:29 +0800
Subject: [PATCH] Merge branch 'dev_business' into fix/hsy/20260811
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/salary/HrmSalaryStructureDO.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/salary/HrmSalaryStructureDO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/salary/HrmSalaryStructureDO.java
index d1d8f57..9c43e3d 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/salary/HrmSalaryStructureDO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/salary/HrmSalaryStructureDO.java
@@ -11,7 +11,7 @@
/**
* 钖叕缁撴瀯 DO
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@TableName("hrm_salary_structure")
@KeySequence("hrm_salary_structure_seq")
@@ -45,9 +45,19 @@
private BigDecimal performanceRatio;
/**
- * 鍔犵彮宸ヨ祫鍊嶇巼
+ * 宸ヤ綔鏃ュ姞鐝伐璧勫�嶇巼
*/
private BigDecimal overtimePayRatio;
+
+ /**
+ * 浼戞伅鏃ュ姞鐝伐璧勫�嶇巼
+ */
+ private BigDecimal restDayOvertimePayRatio;
+
+ /**
+ * 娉曞畾鑺傚亣鏃ュ姞鐝伐璧勫�嶇巼
+ */
+ private BigDecimal legalHolidayOvertimePayRatio;
/**
* 绀句繚鍩烘暟
@@ -69,4 +79,4 @@
*/
private String remark;
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3