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/ServiceFunddetailVO.java | 74 ++++++++++++++++++++++++++++++++++---
1 files changed, 68 insertions(+), 6 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailVO.java
index 7eff77b..44570d4 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailVO.java
@@ -1,6 +1,8 @@
package com.ruoyi.project.domain;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
@@ -200,11 +202,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;
/**
* 鍙戠エ寮犳暟
@@ -214,10 +243,10 @@
private Long invoicecount;
/**
- * 绋庡悗閲戦
+ * 鍔冲姟绋庡悗锛堝師鈥滅◣鍚庨噾棰濃�濓級
*/
- @ApiModelProperty("绋庡悗閲戦")
- @Excel(name = "绋庡悗閲戦")
+ @ApiModelProperty("鍔冲姟绋庡悗")
+ @Excel(name = "鍔冲姟绋庡悗")
private Double taxedamount;
/**
@@ -286,6 +315,12 @@
private String servicesscope;
/**
+ * 搴忓彿
+ */
+ @ApiModelProperty("搴忓彿")
+ private Long xh;
+
+ /**
* 鏈嶅姟鑼冨洿鍚嶇О
*/
@ApiModelProperty("鏈嶅姟鑼冨洿鍚嶇О")
@@ -336,7 +371,21 @@
* 闄勪欢鏂囦欢鍦板潃
*/
@ApiModelProperty("闄勪欢鏂囦欢鍦板潃")
+ @TableField(value = "annexfiles",updateStrategy = FieldStrategy.IGNORED)
private String annexfiles;
+
+ /**
+ * 鍙戠エ鏂囦欢鍦板潃闆嗗悎锛堢敤浜庢帴鏀跺墠绔紶鏉ョ殑鍦板潃锛�
+ */
+ @ApiModelProperty("鍙戠エ鏂囦欢鍦板潃闆嗗悎")
+ private List invoicefilesList;
+
+ /**
+ * 闄勪欢鏂囦欢鍦板潃
+ */
+ @ApiModelProperty("鍙戠エ鏂囦欢鍦板潃")
+ @TableField(value = "invoicefiles",updateStrategy = FieldStrategy.IGNORED)
+ private String invoicefiles;
/**
* 璁＄畻绋庤垂鏃堕棿
@@ -357,5 +406,18 @@
@ApiModelProperty("椤圭洰鍚嶇О璇存槑")
private String itemdescribe;
+
+ /**
+ * 閮ㄩ棬id
+ */
+ @ApiModelProperty("閮ㄩ棬id")
+ private Long deptId;
+
+ /**
+ * 閮ㄩ棬鍚嶇О
+ */
+ @ApiModelProperty("閮ㄩ棬鍚嶇О")
+ private String deptName;
+
}
--
Gitblit v1.9.3