From 09361264d6d87b8ce57b61a26c5507dbc0a01031 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 28 八月 2026 23:16:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_建诚恒商贸' into dev_天津_玮苓乐器

---
 src/main/java/com/ruoyi/production/mapper/ProductionAccountMapper.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/mapper/ProductionAccountMapper.java b/src/main/java/com/ruoyi/production/mapper/ProductionAccountMapper.java
index 2cdc8d0..0658982 100644
--- a/src/main/java/com/ruoyi/production/mapper/ProductionAccountMapper.java
+++ b/src/main/java/com/ruoyi/production/mapper/ProductionAccountMapper.java
@@ -27,6 +27,10 @@
 
     UserAccountDto selectUserAccount(@Param("userId") Long userId, @Param("date") String date);
 
+    List<Map<String, Object>> selectMonthSalaryCalcItems(@Param("userId") Long userId, @Param("date") String date);
+
     List<Map<String, Object>> selectDailyWagesStats(@Param("startDate") String startDate, @Param("endDate") String endDate);
 
+    List<String> selectAccountingMonths();
+
 }

--
Gitblit v1.9.3