From 561aa63737f42136c69e87a8d907727da235b38c Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 16 八月 2024 18:51:41 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo

---
 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 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 dbe6445..99ce37a 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
@@ -216,7 +216,9 @@
     @Excel(name = "鍙戠エ寮犳暟")
     private Long invoicecount;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @ApiModelProperty("$column.columnComment")
     @Excel(name = "涓婁紶鏃堕棿")
     private BigDecimal reimbursementamount;
@@ -337,14 +339,16 @@
      * 闄勪欢鏂囦欢鍦板潃
      */
     @ApiModelProperty("闄勪欢鏂囦欢鍦板潃")
-    @TableField(value = "annexfiles",updateStrategy = FieldStrategy.IGNORED)
+    @TableField(value = "annexfiles", updateStrategy = FieldStrategy.IGNORED)
     private String annexfiles;
 
     /**
      * 闄勪欢鏂囦欢鍦板潃
      */
-    /** 鍙戠エ闄勪欢 */
-    @TableField(value = "invoicefiles",updateStrategy =FieldStrategy.IGNORED)
+    /**
+     * 鍙戠エ闄勪欢
+     */
+    @TableField(value = "invoicefiles", updateStrategy = FieldStrategy.IGNORED)
     @ApiModelProperty("鍙戠エ闄勪欢")
     @Excel(name = "鍙戠エ闄勪欢")
     private String invoicefiles;
@@ -382,5 +386,11 @@
     @ApiModelProperty("閮ㄩ棬鍚嶇О")
     private String deptName;
 
+    /**
+     * 搴忓彿
+     */
+    @ApiModelProperty("搴忓彿")
+    private Long xh;
+
 }
 

--
Gitblit v1.9.3