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/ServiceFunddetailSharedMapper.xml | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailSharedMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailSharedMapper.xml
index 390da09..2d5d1bd 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailSharedMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailSharedMapper.xml
@@ -37,6 +37,9 @@
<result property="amount" column="Amount"/>
<result property="taxamount" column="TaxAmount"/>
<result property="taxedamount" column="TaxedAmount"/>
+ <result property="vatAmount" column="vat_amount"/>
+ <result property="cityTaxAmount" column="city_tax_amount"/>
+ <result property="laborPretaxAmount" column="labor_pretax_amount"/>
<result property="prepaidamount" column="PrepaidAmount"/>
<result property="paidamount" column="paidAmount"/>
<result property="paidtime" column="paidTime"/>
@@ -96,6 +99,9 @@
Amount,
TaxAmount,
TaxedAmount,
+ vat_amount,
+ city_tax_amount,
+ labor_pretax_amount,
PrepaidAmount,
paidAmount,
paidTime,
--
Gitblit v1.9.3