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/StLossYearMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StLossYearMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StLossYearMapper.xml
index 7c151c5..f0ae670 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StLossYearMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StLossYearMapper.xml
@@ -21,7 +21,7 @@
where id = #{id,jdbcType=BIGINT}
</select>
- <select id="selectByIntakeIdAndYear" resultMap="BaseResultMap">
+ <select id="selectByIntakeIdAndYear" resultType="com.dy.pipIrrGlobal.pojoSt.StLossYear">
<!--@mbg.generated-->
select
<include refid="Base_Column_List" />
--
Gitblit v1.8.0