From 01f7b8b3baea652f29e534f78cdcae33bb1ae060 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期四, 28 十一月 2024 21:03:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/domain/form/ProjectInvestmentPolicyComplianceForm.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/business/src/main/java/com/ycl/domain/form/ProjectInvestmentPolicyComplianceForm.java b/business/src/main/java/com/ycl/domain/form/ProjectInvestmentPolicyComplianceForm.java
index b6d7306..38b59a6 100644
--- a/business/src/main/java/com/ycl/domain/form/ProjectInvestmentPolicyComplianceForm.java
+++ b/business/src/main/java/com/ycl/domain/form/ProjectInvestmentPolicyComplianceForm.java
@@ -2,16 +2,18 @@
import com.ycl.common.group.Update;
import com.ycl.common.group.Add;
+import com.ycl.domain.entity.File;
import com.ycl.system.domain.base.AbsForm;
import com.ycl.domain.entity.ProjectInvestmentPolicyCompliance;
import org.springframework.beans.BeanUtils;
-import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import org.springframework.lang.NonNull;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
import java.util.Date;
+import java.util.List;
/**
* 鎶曡祫椤圭洰浜т笟鏀跨瓥绗﹀悎鎯呭喌琛ㄨ〃鍗�
@@ -27,7 +29,7 @@
private Long projectId;
@ApiModelProperty("绗﹀悎浜т笟鏀跨瓥闄勪欢")
- private String policyComplianceAttachment;
+ private List<File> fileList;
@ApiModelProperty("鏄惁灞炰簬銆婁骇涓氱粨鏋勮皟鏁存寚瀵肩洰褰曘�嬩笅鐨勯」鐩�")
private Boolean belongsToIndustryAdjustmentDirectory;
@@ -47,9 +49,6 @@
@ApiModelProperty("涓撻」瑙勫垝澶嶅悎鎯呭喌")
private String specialPlanningCompliance;
- @ApiModelProperty("椤圭洰鑳借�楁儏鍐�")
- private String energyConsumption;
-
@ApiModelProperty("椤圭洰骞寸患鍚堣兘婧愭秷璐归噺锛堟爣鍑嗙叅褰撻噺鍊硷級")
private String annualEnergyConsumption;
@@ -57,10 +56,10 @@
private String annualElectricityConsumption;
@ApiModelProperty("鑺傝兘瀹℃煡锛�1闇�瑕侊紝0涓嶉渶瑕侊級")
- private String energyCheck;
+ private Boolean energyCheck;
@ApiModelProperty("涓嶅啀鍗曠嫭杩涜鑺傝兘瀹℃煡鐨勭被鍨�")
- private String noOnlyCheckType;
+ private Integer noOnlyCheckType;
@ApiModelProperty("澶囨敞")
private String remarks;
--
Gitblit v1.8.0