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 --- docs/projectSql/ruoyi-vue-pro.sql | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/docs/projectSql/ruoyi-vue-pro.sql b/docs/projectSql/ruoyi-vue-pro.sql index 12fd82f..1a34cf4 100644 --- a/docs/projectSql/ruoyi-vue-pro.sql +++ b/docs/projectSql/ruoyi-vue-pro.sql @@ -4903,7 +4903,9 @@ `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '缁撴瀯鍚嶇О', `base_salary` decimal(12, 2) NOT NULL COMMENT '鍩烘湰宸ヨ祫', `performance_ratio` decimal(4, 2) NULL DEFAULT 0.00 COMMENT '缁╂晥宸ヨ祫鍗犳瘮锛�%锛�', - `overtime_pay_ratio` decimal(4, 2) NULL DEFAULT 1.50 COMMENT '鍔犵彮宸ヨ祫鍊嶇巼', + `overtime_pay_ratio` decimal(4, 2) NULL DEFAULT 1.50 COMMENT '宸ヤ綔鏃ュ姞鐝伐璧勫�嶇巼', + `rest_day_overtime_pay_ratio` decimal(4, 2) NULL DEFAULT 2.00 COMMENT '浼戞伅鏃ュ姞鐝伐璧勫�嶇巼', + `legal_holiday_overtime_pay_ratio` decimal(4, 2) NULL DEFAULT 3.00 COMMENT '娉曞畾鑺傚亣鏃ュ姞鐝伐璧勫�嶇巼', `social_security_base` decimal(12, 2) NULL DEFAULT NULL COMMENT '绀句繚鍩烘暟', `housing_fund_base` decimal(12, 2) NULL DEFAULT NULL COMMENT '鍏Н閲戝熀鏁�', `status` tinyint NOT NULL DEFAULT 0 COMMENT '鐘舵�侊細0-鍚敤锛�1-绂佺敤', -- Gitblit v1.9.3