From ee089a8ac4a9d99ef0a0491bbf1d80a2d4fbc393 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期二, 10 十一月 2026 09:15:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-project/src/main/resources/mapper/project/ServiceFundtaxMapper.xml | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFundtaxMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFundtaxMapper.xml
index 472b313..2b057b0 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFundtaxMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFundtaxMapper.xml
@@ -15,6 +15,10 @@
<result property="managerno" column="ManagerNo"/>
<result property="managername" column="ManagerName"/>
<result property="pretaxamount" column="Pretaxamount"/>
+ <result property="vatAmount" column="vat_amount"/>
+ <result property="cityTaxAmount" column="city_tax_amount"/>
+ <result property="laborPretaxAmount" column="labor_pretax_amount"/>
+ <result property="taxVersion" column="tax_version"/>
<result property="taxedamount" column="TaxedAmount"/>
<result property="taxamount" column="TaxAmount"/>
<result property="medicalcost" column="MedicalCost"/>
@@ -60,6 +64,10 @@
Pretaxamount,
TaxedAmount,
TaxAmount,
+ vat_amount,
+ city_tax_amount,
+ labor_pretax_amount,
+ tax_version,
MedicalCost,
BodyMaintainCost,
OrganGainCost,
@@ -143,4 +151,10 @@
where del_flag = 0;
</select>
+ <select id="selectByIdForUpdate" resultMap="ServiceFundtaxResult">
+ <include refid="selectServiceFundtaxVo"/>
+ where ID = #{id}
+ for update
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3