Merge remote-tracking branch 'origin/master'

zss

2024-07-30 8dcefe8d8faa04997e75aa0f8c62b6e715d81b98

 performance-server/src/main/java/com/yuanchu/mom/service/AuxiliaryWorkingHoursDayService.java

@@ -2,11 +2,13 @@

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.dto.AuxiliaryWorkingHoursDayDto;
import com.yuanchu.mom.dto.HoursDay;
import com.yuanchu.mom.pojo.AuxiliaryWorkingHours;
import com.yuanchu.mom.pojo.AuxiliaryWorkingHoursDay;
import com.baomidou.mybatisplus.extension.service.IService;

import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;

/**
@@ -25,7 +27,7 @@

    AuxiliaryWorkingHoursDay selectAuxiliaryWorkingHoursByNumber(String number);

    int checkOrApprove(AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay);
    boolean checkOrApprove(HoursDay hoursDay);

    int updateAuxiliaryWorkingHoursDay(AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay);