From d9de769c21b1600d94f52eaceb4382aaa3523575 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期五, 19 七月 2024 17:55:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
performance-server/src/main/java/com/yuanchu/mom/service/AuxiliaryWorkingHoursDayService.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 86669a0..fd84bcd 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
@@ -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);
--
Gitblit v1.9.3