Merge branch 'dev_New_pro' into dev_平遥县盛达铸造厂

gongchunyi

2026-07-07 72a32c227fdf10f34fe563a7de35169da5729eea

 src/main/java/com/ruoyi/approve/controller/HolidaySettingsController.java

@@ -18,13 +18,9 @@
@RequestMapping("/holidaySettings")
@AllArgsConstructor
public class HolidaySettingsController {
    @Autowired
    private HolidaySettingsService holidaySettingsService;
    @Autowired
    private AnnualLeaveSettingMapper annualLeaveSettingMapper;
    @Autowired
    private OvertimeSettingMapper overtimeSettingMapper;
    @Autowired
    private WorkingHoursSettingMapper workingHoursSettingMapper;

    /**、