From ae347a6603c94f73462c9c3e39c3e04476556d6e Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 19 二月 2025 11:05:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java b/business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java
index 80a91ff..17c6a4b 100644
--- a/business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java
+++ b/business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java
@@ -78,11 +78,13 @@
@ApiModelProperty("閲嶇偣鍒嗙被 (0鐪侀噸鐐归」鐩�, 1閬傚畞甯傞噸鐐归」鐩�, 2.灏勬椽甯傞噸鐐归」鐩�, 3.涓�鑸」鐩�)")
private String importanceType;
- @ApiModelProperty("骞村害鎶曡祫璁″垝")
- private String year;
-
+// @ApiModelProperty("骞村害鎶曡祫璁″垝")
+// private String year;
+//
+// @ApiModelProperty("骞村害鎶曡祫閲戦")
+// private BigDecimal yearInvestAmount;
@ApiModelProperty("骞村害鎶曡祫閲戦")
- private BigDecimal yearInvestAmount;
+ private ProjectInfoYearPlanForm yearPlanList;
@ApiModelProperty("绔嬮」鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -96,15 +98,17 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date planCompleteTime;
- @ApiModelProperty("涓爣鍗曚綅")
- private String winUnit;
-
- @ApiModelProperty("涓爣閲戦")
- private String winAmount;
-
- @ApiModelProperty("涓爣鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date winTime;
+// @ApiModelProperty("涓爣鍗曚綅")
+// private String winUnit;
+//
+// @ApiModelProperty("涓爣閲戦")
+// private String winAmount;
+//
+// @ApiModelProperty("涓爣鏃堕棿")
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+// private Date winTime;
+ @ApiModelProperty("涓爣鍗曚綅淇℃伅")
+ private List<ProjectInfoWinUnitForm> winUnitList;
@ApiModelProperty("璇︾粏鍦板潃")
private String projectAddress;
--
Gitblit v1.8.0