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/ServiceFunddetail.java | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java
index 437f4cb..d709f5e 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java
@@ -217,11 +217,38 @@
private Double prepaidamount;
/**
- * 鎵ｇ◣閲戦
+ * 鍔冲姟涓◣锛堝師鈥滄墸绋庨噾棰濃�濓級
*/
- @ApiModelProperty("鎵ｇ◣閲戦")
- @Excel(name = "鎵ｇ◣閲戦")
+ @ApiModelProperty("鍔冲姟涓◣")
+ @Excel(name = "鍔冲姟涓◣")
private Double taxamount;
+
+ /**
+ * 澧炲�肩◣
+ */
+ @ApiModelProperty("澧炲�肩◣")
+ @Excel(name = "澧炲�肩◣")
+ private Double vatAmount;
+
+ /**
+ * 鍩庡缓绋�
+ */
+ @ApiModelProperty("鍩庡缓绋�")
+ @Excel(name = "鍩庡缓绋�")
+ private Double cityTaxAmount;
+
+ /**
+ * 鍔冲姟绋庡墠閲戦
+ */
+ @ApiModelProperty("鍔冲姟绋庡墠閲戦")
+ @Excel(name = "鍔冲姟绋庡墠")
+ private Double laborPretaxAmount;
+
+ /**
+ * 绋庡彛寰勭増鏈細v1=鍘嗗彶鍙ｅ緞锛堟棤澧炲�肩◣/鍩庡缓绋庯級锛寁2=鏂板鍙ｅ緞
+ */
+ @ApiModelProperty("绋庡彛寰勭増鏈�")
+ private String taxVersion;
/**
* 鍙戠エ寮犳暟
@@ -237,10 +264,10 @@
@Excel(name = "涓婁紶鏃堕棿")
private BigDecimal reimbursementamount;
/**
- * 绋庡悗閲戦
+ * 鍔冲姟绋庡悗锛堝師鈥滅◣鍚庨噾棰濃�濓級
*/
- @ApiModelProperty("绋庡悗閲戦")
- @Excel(name = "绋庡悗閲戦")
+ @ApiModelProperty("鍔冲姟绋庡悗")
+ @Excel(name = "鍔冲姟绋庡悗")
private Double taxedamount;
/**
--
Gitblit v1.9.3