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 | 98 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 92 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 2362ef7..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
@@ -4,6 +4,8 @@
import java.util.Date;
import java.util.List;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -73,6 +75,13 @@
@ApiModelProperty("宸ヤ綔鍗曚綅鐢ㄦ埛缂栧彿")
@Excel(name = "宸ヤ綔鍗曚綅鐢ㄦ埛缂栧彿")
private String unituserno;
+
+ /**
+ * 鍗曚綅鏍囪瘑锛�1=鍗曚綅锛堝彈鐩婁汉閫夋嫨鍗曚綅鏃朵笉闇�瑕佽韩浠借瘉鍙凤級锛�0=涓汉
+ */
+ @ApiModelProperty("鍗曚綅鏍囪瘑锛�1=鍗曚綅锛�0=涓汉")
+ @Excel(name = "鍗曚綅鏍囪瘑", readConverterExp = "1=鍗曚綅,0=涓汉")
+ private Integer isunit;
/**
* 鑱岀О,瑙佸瓧鍏竤ys_professionaltitle
@@ -196,16 +205,50 @@
/**
* 棰勬敮閲戦
*/
+ @ApiModelProperty("绋庡墠鎬婚噾棰�")
+ @Excel(name = "绋庡墠鎬婚噾棰�")
+ private Double allAmount;
+
+ /**
+ * 棰勬敮閲戦
+ */
@ApiModelProperty("棰勬敮閲戦")
@Excel(name = "棰勬敮閲戦")
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;
/**
* 鍙戠エ寮犳暟
@@ -215,10 +258,16 @@
private Long invoicecount;
/**
- * 绋庡悗閲戦
+ * $column.columnComment
*/
- @ApiModelProperty("绋庡悗閲戦")
- @Excel(name = "绋庡悗閲戦")
+ @ApiModelProperty("$column.columnComment")
+ @Excel(name = "涓婁紶鏃堕棿")
+ private BigDecimal reimbursementamount;
+ /**
+ * 鍔冲姟绋庡悗锛堝師鈥滅◣鍚庨噾棰濃�濓級
+ */
+ @ApiModelProperty("鍔冲姟绋庡悗")
+ @Excel(name = "鍔冲姟绋庡悗")
private Double taxedamount;
/**
@@ -331,7 +380,19 @@
* 闄勪欢鏂囦欢鍦板潃
*/
@ApiModelProperty("闄勪欢鏂囦欢鍦板潃")
+ @TableField(value = "annexfiles", updateStrategy = FieldStrategy.IGNORED)
private String annexfiles;
+
+ /**
+ * 闄勪欢鏂囦欢鍦板潃
+ */
+ /**
+ * 鍙戠エ闄勪欢
+ */
+ @TableField(value = "invoicefiles", updateStrategy = FieldStrategy.IGNORED)
+ @ApiModelProperty("鍙戠エ闄勪欢")
+ @Excel(name = "鍙戠エ闄勪欢")
+ private String invoicefiles;
/**
@@ -347,5 +408,30 @@
@ApiModelProperty("缁╂晥鏃ユ湡")
private String jxrq;
+
+ /**
+ * 椤圭洰鍚嶇О璇存槑
+ */
+ @ApiModelProperty("椤圭洰鍚嶇О璇存槑")
+ private String itemdescribe;
+
+ /**
+ * 閮ㄩ棬id
+ */
+ @ApiModelProperty("閮ㄩ棬id")
+ private Long deptId;
+
+ /**
+ * 閮ㄩ棬鍚嶇О
+ */
+ @ApiModelProperty("閮ㄩ棬鍚嶇О")
+ private String deptName;
+
+ /**
+ * 搴忓彿
+ */
+ @ApiModelProperty("搴忓彿")
+ private Long xh;
+
}
--
Gitblit v1.9.3