From ef57094e91072ebe05bb3781e028d6d7ad8a0c45 Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: 星期一, 17 二月 2025 11:15:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-20250116' into dev-20250116
---
exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml b/exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml
index 87f4d9c..2cabe3f 100644
--- a/exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml
+++ b/exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml
@@ -40,6 +40,7 @@
<result property="payType" column="pay_type"/>
<result property="amount" column="amount"/>
<result property="year" column="year"/>
+ <result property="payPersonType" column="pay_person_type"/>
<result property="quarter" column="quarter"/>
<collection property="nonCoalPayCategoryList" javaType="java.util.List" resultMap="nonCoalPayCategoryList"/>
</resultMap>
@@ -147,6 +148,7 @@
d.dept_name,
a.district_code,
a.pay_type,
+ a.pay_person_type,
a.amount,
a.year,
a.quarter,
@@ -171,6 +173,7 @@
d.dept_name,
a.district_code,
a.pay_type,
+ a.pay_person_type,
a.amount,
a.year,
a.quarter,
--
Gitblit v1.9.2