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/java/com/ruoyi/project/domain/ServiceFunddetailExcel.java |   34 ++++++++++++++++++++++++++++++----
 1 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailExcel.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailExcel.java
index ce4672a..1e3edb3 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailExcel.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailExcel.java
@@ -72,13 +72,39 @@
     @Excel(name = "绋庡墠閲戦")
     private Double amount;
 
-
+    /**
+     * 澧炲�肩◣
+     */
+    @ApiModelProperty("澧炲�肩◣")
+    @Excel(name = "澧炲�肩◣")
+    private Double vatAmount;
 
     /**
-     * 绋庡悗閲戦
+     * 鍩庡缓绋�
      */
-    @ApiModelProperty("绋庡悗閲戦")
-    @Excel(name = "绋庡悗閲戦")
+    @ApiModelProperty("鍩庡缓绋�")
+    @Excel(name = "鍩庡缓绋�")
+    private Double cityTaxAmount;
+
+    /**
+     * 鍔冲姟绋庡墠
+     */
+    @ApiModelProperty("鍔冲姟绋庡墠")
+    @Excel(name = "鍔冲姟绋庡墠")
+    private Double laborPretaxAmount;
+
+    /**
+     * 鍔冲姟涓◣
+     */
+    @ApiModelProperty("鍔冲姟涓◣")
+    @Excel(name = "鍔冲姟涓◣")
+    private Double taxamount;
+
+    /**
+     * 鍔冲姟绋庡悗
+     */
+    @ApiModelProperty("鍔冲姟绋庡悗")
+    @Excel(name = "鍔冲姟绋庡悗")
     private Double taxedamount;
 
     /**

--
Gitblit v1.9.3