From 7cdc66043ad8c484b8eb4597e281a5d8d33e4794 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 25 八月 2023 16:41:12 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java
index 9d7034d..a6e79da 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java
@@ -88,53 +88,53 @@
/** 绋庡墠閲戦鍚堣 */
@ApiModelProperty("绋庡墠閲戦鍚堣")
@Excel(name = "绋庡墠閲戦鍚堣")
- private BigDecimal pretaxcost;
+ private Double pretaxcost;
/** 绋庡悗閲戦鍚堣 */
@ApiModelProperty("绋庡悗閲戦鍚堣")
@Excel(name = "绋庡悗閲戦鍚堣")
- private BigDecimal taxedcost;
+ private Double taxedcost;
/** 璐圭敤鎬婚噾棰� */
@ApiModelProperty("璐圭敤鎬婚噾棰�")
@Excel(name = "璐圭敤鎬婚噾棰�")
- private BigDecimal totalcost;
+ private Double totalcost;
/** 鑾峰彇涓撳鎬昏垂鐢� */
@ApiModelProperty("鑾峰彇涓撳鎬昏垂鐢�")
//鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
//@TableId(type = IdType.AUTO)
- private BigDecimal procurementcost;
+ private Double procurementcost;
/** 涓撳璐圭敤鎬婚噾棰� */
@ApiModelProperty("涓撳璐圭敤鎬婚噾棰�")
@Excel(name = "涓撳璐圭敤鎬婚噾棰�")
- private BigDecimal expertcost;
+ private Double expertcost;
/** 浼︾悊瀹℃煡璐圭敤鎬婚噾棰� */
@ApiModelProperty("浼︾悊瀹℃煡璐圭敤鎬婚噾棰�")
@Excel(name = "浼︾悊瀹℃煡璐圭敤鎬婚噾棰�")
- private BigDecimal ethicscost;
+ private Double ethicscost;
/** 鎹愮尞鑰呭尰瀛︽垚鏈�婚噾棰� */
@ApiModelProperty("鎹愮尞鑰呭尰瀛︽垚鏈�婚噾棰�")
@Excel(name = "鎹愮尞鑰呭尰瀛︽垚鏈�婚噾棰�")
- private BigDecimal medicalcost;
+ private Double medicalcost;
/** 鎹愮尞鑰呭灞為瀹胯垂鎬婚噾棰� */
@ApiModelProperty("鎹愮尞鑰呭灞為瀹胯垂鎬婚噾棰�")
@Excel(name = "鎹愮尞鑰呭灞為瀹胯垂鎬婚噾棰�")
- private BigDecimal familycost;
+ private Double familycost;
/** 鎹愮尞鑰呭杽鍚庢垚鏈�婚噾棰� */
@ApiModelProperty("鎹愮尞鑰呭杽鍚庢垚鏈�婚噾棰�")
@Excel(name = "鎹愮尞鑰呭杽鍚庢垚鏈�婚噾棰�")
- private BigDecimal aftercarecost;
+ private Double aftercarecost;
/** 鐢宠閲戦 */
@ApiModelProperty("鐢宠閲戦")
@Excel(name = "鐢宠閲戦")
- private BigDecimal amountrequested;
+ private Double amountrequested;
/** 璧勯噾绫诲埆 瑙佸瓧鍏竤ys_ConsolationType */
@ApiModelProperty("璧勯噾绫诲埆 瑙佸瓧鍏竤ys_ConsolationType")
@@ -185,6 +185,12 @@
@ApiModelProperty("璐㈠姟鍓櫌闀跨瀛�")
@Excel(name = "璐㈠姟鍓櫌闀跨瀛�")
private String finvicepresident;
+
+ /** 闄㈤暱绛惧瓧 */
+ @ApiModelProperty("闄㈤暱绛惧瓧")
+ @Excel(name = "闄㈤暱绛惧瓧")
+ private String president;
+
/** 涓氬姟鍓櫌闀跨瀛� */
@ApiModelProperty("涓氬姟鍓櫌闀跨瀛�")
@@ -267,5 +273,10 @@
@Excel(name = "璐㈠姟椹冲洖淇℃伅锛氬鍚�+' '+鏃堕棿+' '+鎰忚")
private String cxrjyj;
+ /**
+ * 瀹℃壒缁撴灉锛堚�滀腑蹇冪瀛椻�� 涓�1锛岃储鍔″壇闄㈤暱绛惧瓧涓�2锛屼笟鍔″壇闄㈤暱绛惧瓧涓�3锛変互鈥滐紝鈥濆垎寮�锛屽鏋�1锛�2锛�3閮芥湁浜嗭紝璇存槑杩欎釜瀹℃壒瀹屾垚浜�
+ */
+ @ApiModelProperty("瀹℃壒缁撴灉")
+ private int spjg;
}
--
Gitblit v1.9.3