From 519886a70d630e3cdd6c0f40f55fcebc6e780dc5 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 19 三月 2024 17:45:11 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java | 44 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 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 bbac545..c11bea1 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瀛ｅ害銆�3骞村害
- */
- @ApiModelProperty("缁╂晥锛�1銆佹湀搴︺��2瀛ｅ害銆�3骞村害")
- @Excel(name = "缁╂晥锛�1銆佹湀搴︺��2瀛ｅ害銆�3骞村害")
- private Integer performancetype;
-
-
- /**
* 鏄惁绠楃◣锛�0鏈畻绋庯紝1宸茬畻绋�
*/
@ApiModelProperty("鏄惁绠楃◣锛�0鏈畻绋庯紝1宸茬畻绋�")
@@ -363,13 +355,45 @@
@Excel(name = "涓婃姤鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date applyTime;
- @ApiModelProperty("鏁版嵁鏄惁杩涘叆shared琛� 0锛氬惁 1锛氭槸")
- private Integer uploadStates = 0;
+ @ApiModelProperty("鏁版嵁鏄惁杩涘叆shared琛� 0锛氬彂璧� 1锛氬緟涓婁紶 2锛氬凡涓婁紶")
+ private Integer uploadStates;
/**
* 鏉ョ敤璁板綍鎻掑叆鍒嗕韩琛ㄥけ璐�
*/
@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瀛ｅ害銆�3骞村害
+ */
+ @ApiModelProperty("缁╂晥锛�1銆佹湀搴︺��2瀛ｅ害銆�3骞村害")
+ @Excel(name = "缁╂晥锛�1銆佹湀搴︺��2瀛ｅ害銆�3骞村害")
+ private Integer performancetype;
+
+ /**
+ * 涓撳璐圭敤绠楃◣鐢宠涓昏〃ID,褰撳�间负-1鏃讹紝琛ㄧずfundTaxId涓簄ull
+ */
+ @ApiModelProperty("涓撳璐圭敤绠楃◣鐢宠涓昏〃ID")
+ @Excel(name = "涓撳璐圭敤绠楃◣鐢宠涓昏〃ID")
+ private Long fundTaxId = null;
+
+ /**
+ * 绋庨噾
+ */
+ @ApiModelProperty("绋庨噾")
+ @Excel(name = "绋庨噾")
+ private Double taxcost;
+
+
}
--
Gitblit v1.9.3