Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

liyong

8 天以前 473d21a70284f793e8042eb618e2b1ffceb11a66

 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;

    /**、