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/ServiceFunddetailShared.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailShared.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailShared.java
index 64f6c0b..272bce7 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailShared.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailShared.java
@@ -242,20 +242,41 @@
private Double amount;
/**
- * 鎵ｇ◣閲戦
+ * 鍔冲姟涓◣锛堝師鈥滄墸绋庨噾棰濃�濓級
*/
- @ApiModelProperty("鎵ｇ◣閲戦")
- @Excel(name = "鎵ｇ◣閲戦")
+ @ApiModelProperty("鍔冲姟涓◣")
+ @Excel(name = "鍔冲姟涓◣")
private Double taxamount;
/**
- * 绋庡悗閲戦
+ * 鍔冲姟绋庡悗锛堝師鈥滅◣鍚庨噾棰濃�濓級
*/
- @ApiModelProperty("绋庡悗閲戦")
- @Excel(name = "绋庡悗閲戦")
+ @ApiModelProperty("鍔冲姟绋庡悗")
+ @Excel(name = "鍔冲姟绋庡悗")
private Double taxedamount;
/**
+ * 澧炲�肩◣
+ */
+ @ApiModelProperty("澧炲�肩◣")
+ @Excel(name = "澧炲�肩◣")
+ private Double vatAmount;
+
+ /**
+ * 鍩庡缓绋�
+ */
+ @ApiModelProperty("鍩庡缓绋�")
+ @Excel(name = "鍩庡缓绋�")
+ private Double cityTaxAmount;
+
+ /**
+ * 鍔冲姟绋庡墠閲戦
+ */
+ @ApiModelProperty("鍔冲姟绋庡墠閲戦")
+ @Excel(name = "鍔冲姟绋庡墠")
+ private Double laborPretaxAmount;
+
+ /**
* 棰勬敮閲戦
*/
@ApiModelProperty("棰勬敮閲戦")
--
Gitblit v1.9.3