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/ServiceFundtax.java | 45 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 36 insertions(+), 9 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundtax.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundtax.java
index 9f391b7..c378ffa 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundtax.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundtax.java
@@ -98,24 +98,51 @@
private BigDecimal pretaxamount;
/**
- * 绋庡悗閲戦鍚堣
+ * 澧炲�肩◣鍚堣
*/
- @ApiModelProperty("绋庡悗閲戦鍚堣")
- @Excel(name = "绋庡悗閲戦鍚堣")
+ @ApiModelProperty("澧炲�肩◣鍚堣")
+ @Excel(name = "澧炲�肩◣鍚堣")
+ private BigDecimal vatAmount;
+
+ /**
+ * 鍩庡缓绋庡悎璁�
+ */
+ @ApiModelProperty("鍩庡缓绋庡悎璁�")
+ @Excel(name = "鍩庡缓绋庡悎璁�")
+ private BigDecimal cityTaxAmount;
+
+ /**
+ * 鍔冲姟绋庡墠鍚堣
+ */
+ @ApiModelProperty("鍔冲姟绋庡墠鍚堣")
+ @Excel(name = "鍔冲姟绋庡墠鍚堣")
+ private BigDecimal laborPretaxAmount;
+
+ /**
+ * 绋庡彛寰勭増鏈細v1=鍘嗗彶鍙ｅ緞锛堟棤澧炲�肩◣/鍩庡缓绋庯級锛寁2=鏂板鍙ｅ緞
+ */
+ @ApiModelProperty("绋庡彛寰勭増鏈�")
+ private String taxVersion;
+
+ /**
+ * 鍔冲姟绋庡悗锛堝師鈥滅◣鍚庨噾棰濆悎璁♀�濓級
+ */
+ @ApiModelProperty("鍔冲姟绋庡悗鍚堣")
+ @Excel(name = "鍔冲姟绋庡悗鍚堣")
private BigDecimal taxedamount;
/**
- * 璐圭敤鎬婚噾棰�
+ * 鍔冲姟涓◣鍚堣
*/
- @ApiModelProperty("璐圭敤鎬婚噾棰�")
- @Excel(name = "璐圭敤鎬婚噾棰�")
+ @ApiModelProperty("鍔冲姟涓◣鍚堣")
+ @Excel(name = "鍔冲姟涓◣鍚堣")
private BigDecimal taxamount;
/**
- * 鎵ｇ◣閲戦
+ * 鍔冲姟涓◣鍚堣锛堝巻鍙插瓧娈� tax_money锛岄〉闈⑩�滄墸绋庨噾棰濃�濆彇姝ゅ垪锛�
*/
- @ApiModelProperty("鎵ｇ◣閲戦")
- @Excel(name = "鎵ｇ◣閲戦")
+ @ApiModelProperty("鍔冲姟涓◣锛堟墸绋庨噾棰濓級")
+ @Excel(name = "鍔冲姟涓◣")
private BigDecimal taxMoney;
/**
--
Gitblit v1.9.3