From 2fdb37e47a5e2ed88ea2fa8bd44072883cc76fc3 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 19 三月 2024 14:01:40 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java |   33 +++++++++++++++++++++++++--------
 1 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java
index a35a71e..e2c21ca 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java
@@ -334,14 +334,6 @@
     private Integer checkstatus;
 
     /**
-     * 缁╂晥锛�1銆佹湀搴︺��2瀛e害銆�3骞村害
-     */
-    @ApiModelProperty("缁╂晥锛�1銆佹湀搴︺��2瀛e害銆�3骞村害")
-    @Excel(name = "缁╂晥锛�1銆佹湀搴︺��2瀛e害銆�3骞村害")
-    private Integer performancetype;
-
-
-    /**
      * 鏄惁绠楃◣锛�0鏈畻绋庯紝1宸茬畻绋�
      */
     @ApiModelProperty("鏄惁绠楃◣锛�0鏈畻绋庯紝1宸茬畻绋�")
@@ -371,5 +363,30 @@
      */
     @ApiModelProperty("鏉ョ敤璁板綍鎻掑叆鍒嗕韩琛ㄥけ璐�")
     private String notes;
+
+
+    /**
+     * 缁╂晥鏃ユ湡
+     */
+    @ApiModelProperty("缁╂晥鏃ユ湡")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "缁╂晥鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date jxrq;
+
+    /**
+     * 缁╂晥锛�1銆佹湀搴︺��2瀛e害銆�3骞村害
+     */
+    @ApiModelProperty("缁╂晥锛�1銆佹湀搴︺��2瀛e害銆�3骞村害")
+    @Excel(name = "缁╂晥锛�1銆佹湀搴︺��2瀛e害銆�3骞村害")
+    private Integer performancetype;
+
+    /**
+     * 涓撳璐圭敤绠楃◣鐢宠涓昏〃ID,褰撳�间负-1鏃讹紝琛ㄧずfundTaxId涓簄ull
+     */
+    @ApiModelProperty("涓撳璐圭敤绠楃◣鐢宠涓昏〃ID")
+    @Excel(name = "涓撳璐圭敤绠楃◣鐢宠涓昏〃ID")
+    private Long fundTaxId;
+
+
 }
 

--
Gitblit v1.9.3