From 8dcefe8d8faa04997e75aa0f8c62b6e715d81b98 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 30 七月 2024 20:08:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 performance-server/src/main/java/com/yuanchu/mom/mapper/AuxiliaryOutputWorkingHoursMapper.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/performance-server/src/main/java/com/yuanchu/mom/mapper/AuxiliaryOutputWorkingHoursMapper.java b/performance-server/src/main/java/com/yuanchu/mom/mapper/AuxiliaryOutputWorkingHoursMapper.java
index b94f040..4ded00e 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/mapper/AuxiliaryOutputWorkingHoursMapper.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/mapper/AuxiliaryOutputWorkingHoursMapper.java
@@ -30,7 +30,7 @@
     List<AuxiliaryOutputWorkingHoursDto> selectDataByUser(@Param("ids") List<Integer> ids);
 
     //鏌ヨ璇ユ湀鐨勪骇閲忓伐鏃�
-    List<Map<String, Object>> totalHours(@Param("month") String month, @Param("ids") List<Integer> ids);
+    List<Map<String, Object>> totalHours(@Param("month") String month, @Param("ids") List<Integer> ids, @Param("type") String type);
 
 
     List<AuxiliaryOutputWorkingHours> selectListByIds(@Param("ids") List<Integer> ids);

--
Gitblit v1.9.3