From 66990e9be43f71b89aa42065d696b682d803afa6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 25 三月 2025 10:07:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
performance-server/src/main/java/com/yuanchu/mom/service/AuxiliaryOutputWorkingHoursService.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/performance-server/src/main/java/com/yuanchu/mom/service/AuxiliaryOutputWorkingHoursService.java b/performance-server/src/main/java/com/yuanchu/mom/service/AuxiliaryOutputWorkingHoursService.java
index 4843e27..f106acb 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/service/AuxiliaryOutputWorkingHoursService.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/service/AuxiliaryOutputWorkingHoursService.java
@@ -1,8 +1,6 @@
package com.yuanchu.mom.service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.mom.dto.AuxiliaryOutputWorkingHoursDto;
import com.yuanchu.mom.pojo.AuxiliaryOutputWorkingHours;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -20,13 +18,13 @@
*/
public interface AuxiliaryOutputWorkingHoursService extends IService<AuxiliaryOutputWorkingHours> {
- Map<String, Object> selectAuxiliaryOutputWorkingHours(Page page, AuxiliaryOutputWorkingHoursDto auxiliaryOutputWorkingHoursDto);
+ Map<String, Object> selectAuxiliaryOutputWorkingHours(Page page, AuxiliaryOutputWorkingHours auxiliaryOutputWorkingHoursDto);
/**
* 缁熻浜ч噺宸ユ椂姹囨�诲拰杈呭姪宸ユ椂姹囨��
* @return
*/
- Map<String,Object> collectWorkingHours();
+ Map<String,Object> collectWorkingHours(AuxiliaryOutputWorkingHours auxiliaryOutputWorkingHoursDto);
/**
* 瀵煎嚭
--
Gitblit v1.9.3