From 29cadb9df9e289fc4dd45d17e577fe9695232ea4 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 30 五月 2024 22:35:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 performance-server/src/main/java/com/yuanchu/mom/service/AuxiliaryWorkingHoursDayService.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/performance-server/src/main/java/com/yuanchu/mom/service/AuxiliaryWorkingHoursDayService.java b/performance-server/src/main/java/com/yuanchu/mom/service/AuxiliaryWorkingHoursDayService.java
index 8f3c971..86669a0 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/service/AuxiliaryWorkingHoursDayService.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/service/AuxiliaryWorkingHoursDayService.java
@@ -1,6 +1,7 @@
 package com.yuanchu.mom.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.dto.AuxiliaryWorkingHoursDayDto;
 import com.yuanchu.mom.pojo.AuxiliaryWorkingHours;
 import com.yuanchu.mom.pojo.AuxiliaryWorkingHoursDay;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -18,13 +19,13 @@
  */
 public interface AuxiliaryWorkingHoursDayService extends IService<AuxiliaryWorkingHoursDay> {
 
-    Map<String, Object> selectAuxiliaryWorkingHoursDay(Page page, AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay);
+    Map<String, Object> selectAuxiliaryWorkingHoursDay(Page page, AuxiliaryWorkingHoursDayDto auxiliaryWorkingHoursDayDto);
 
     int insertAuxiliaryWorkingHoursDay(AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay);
 
     AuxiliaryWorkingHoursDay selectAuxiliaryWorkingHoursByNumber(String number);
 
-    int checkOrApprove(Integer id, String state);
+    int checkOrApprove(AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay);
 
     int updateAuxiliaryWorkingHoursDay(AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay);
 

--
Gitblit v1.9.3