From 3128a684d6654131f01472ee95aa3f09a9d12dac Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 26 三月 2025 14:24:50 +0800
Subject: [PATCH] 1、git同步冲突引起文件丢失,进行系统恢复,并屏蔽一个非git提交的模块; 2、增加文件《增加一个单位(orgTag)》。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/StLossMonthMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StLossMonthMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StLossMonthMapper.xml
index 0b2da89..d11c76f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StLossMonthMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StLossMonthMapper.xml
@@ -118,7 +118,8 @@
<select id="statisticsByIntake" resultType="com.dy.pipIrrGlobal.voSt.VoIntakeLossStatistics">
- select intake_id, sum(amount) as amount
+ select intake_id as intakeId,
+ sum(amount) as amount
from st_loss_month
where `year` = #{year,jdbcType=INTEGER}
group by intake_id
--
Gitblit v1.8.0