From ff540dab36d33379a00592d56cc796e21f993f81 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 21 二月 2025 11:06:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 17c6a4b..35787ca 100644
--- a/business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java
+++ b/business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java
@@ -45,8 +45,11 @@
@ApiModelProperty("寤鸿鎬ц川")
private String constructionNature;
- @ApiModelProperty("椤圭洰绫诲瀷锛�0鎴垮眿寤虹瓚锛�1鍩庡競鍩虹璁炬柦锛�2浜ら�氳繍杈擄紝3姘村埄锛�4鑳芥簮锛�5闈炵叅鐭垮北锛�6鍏朵粬锛�")
+ @ApiModelProperty("椤圭洰绫诲瀷")
private String projectType;
+
+ @ApiModelProperty("椤圭洰瀛愮被鍨�")
+ private String projectSubType;
@ApiModelProperty("椤圭洰鐘舵�� (0鏈紑宸ワ紝1宸插紑宸ワ紝2宸茬宸ワ紝3鏆傚仠)")
private String projectStatus;
@@ -84,7 +87,7 @@
// @ApiModelProperty("骞村害鎶曡祫閲戦")
// private BigDecimal yearInvestAmount;
@ApiModelProperty("骞村害鎶曡祫閲戦")
- private ProjectInfoYearPlanForm yearPlanList;
+ private List<ProjectInfoYearPlanForm> yearPlanList;
@ApiModelProperty("绔嬮」鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -134,6 +137,13 @@
@ApiModelProperty("璧嬬爜")
private String coding;
+ @ApiModelProperty("琛屼笟涓荤閮ㄩ棬")
+ private Long industryCompetentDepartment;
+ @ApiModelProperty("琛屼笟涓荤閮ㄩ棬鑱旂郴浜�")
+ private Long industryCompetentDepartmentPerson;
+ @ApiModelProperty("琛屼笟涓荤閮ㄩ棬鑱旂郴鏂瑰紡")
+ private String departmentPersonPhone;
+
private String remark;
public static ProjectInfo getEntityByForm(@NonNull ProjectInfoForm form, ProjectInfo entity) {
if(entity == null) {
--
Gitblit v1.8.0