!8589 !8588 Merge branch 'master' into dev_zhou

Merge pull request !8589 from 李鹏宇/dev
2026-02-03 02:03:45 +00:00
parent e80cdc4a23 78157effc2
commit bd7dd2cc1d
1 changed files with 1 additions and 1 deletions
@@ -549,7 +549,7 @@ class HolidaysRequestBatch(models.Model):
            })
            ('start_time', '>=', datetime(2025, 12, 1)),
            remaining_deduct = deduct_days
-            vacation_report.vacation_report += deduct_days
+            vacation_report.used_this_year1 += deduct_days
            # 优先扣减上年剩余（补休）
            if vacation_report.dynamic_previous_year1 > 0:
                if vacation_report.dynamic_previous_year1 >= remaining_deduct: