From f20fad8125774e487e133e909b323b43bd11db24 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 03 三月 2025 20:40:15 +0800
Subject: [PATCH] Merge branch 'master' into dev
---
business/src/main/java/com/ycl/domain/vo/ProjectInvestmentPolicyComplianceVO.java | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/business/src/main/java/com/ycl/domain/vo/ProjectInvestmentPolicyComplianceVO.java b/business/src/main/java/com/ycl/domain/vo/ProjectInvestmentPolicyComplianceVO.java
index 61b1e88..4c4cbe2 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProjectInvestmentPolicyComplianceVO.java
+++ b/business/src/main/java/com/ycl/domain/vo/ProjectInvestmentPolicyComplianceVO.java
@@ -1,5 +1,6 @@
package com.ycl.domain.vo;
+import com.ycl.domain.entity.File;
import com.ycl.system.domain.base.AbsVo;
import com.ycl.domain.entity.ProjectInvestmentPolicyCompliance;
import java.util.List;
@@ -26,15 +27,11 @@
/** 绗﹀悎浜т笟鏀跨瓥闄勪欢 */
@ApiModelProperty("绗﹀悎浜т笟鏀跨瓥闄勪欢")
- private String policyComplianceAttachment;
+ private List<File> fileList;
/** 鏄惁灞炰簬銆婁骇涓氱粨鏋勮皟鏁存寚瀵肩洰褰曘�嬩笅鐨勯」鐩� */
@ApiModelProperty("鏄惁灞炰簬銆婁骇涓氱粨鏋勮皟鏁存寚瀵肩洰褰曘�嬩笅鐨勯」鐩�")
private Boolean belongsToIndustryAdjustmentDirectory;
-
- /** 鏄惁灞炰簬鏈垪鍏ャ�婁骇涓氱粨鏋勮皟鏁存寚瀵肩洰褰曘�嬬殑鍏佽绫婚」鐩� */
- @ApiModelProperty("鏄惁灞炰簬鏈垪鍏ャ�婁骇涓氱粨鏋勮皟鏁存寚瀵肩洰褰曘�嬬殑鍏佽绫婚」鐩�")
- private Boolean belongsToAllowedProjects;
/** 鏄惁灞炰簬銆婅タ閮ㄥ湴鍖洪紦鍔辩被浜т笟鐩綍銆嬬殑椤圭洰 */
@ApiModelProperty("鏄惁灞炰簬銆婅タ閮ㄥ湴鍖洪紦鍔辩被浜т笟鐩綍銆嬬殑椤圭洰")
@@ -46,15 +43,11 @@
/** 濉姤淇℃伅鏄惁鐪熷疄 */
@ApiModelProperty("濉姤淇℃伅鏄惁鐪熷疄")
- private Integer informationIsTrue;
+ private Boolean informationIsTrue;
/** 涓撻」瑙勫垝澶嶅悎鎯呭喌 */
@ApiModelProperty("涓撻」瑙勫垝澶嶅悎鎯呭喌")
private String specialPlanningCompliance;
-
- /** 椤圭洰鑳借�楁儏鍐� */
- @ApiModelProperty("椤圭洰鑳借�楁儏鍐�")
- private String energyConsumption;
/** 椤圭洰骞寸患鍚堣兘婧愭秷璐归噺锛堟爣鍑嗙叅褰撻噺鍊硷級 */
@ApiModelProperty("椤圭洰骞寸患鍚堣兘婧愭秷璐归噺锛堟爣鍑嗙叅褰撻噺鍊硷級")
@@ -66,11 +59,11 @@
/** 鑺傝兘瀹℃煡锛�1闇�瑕侊紝0涓嶉渶瑕侊級 */
@ApiModelProperty("鑺傝兘瀹℃煡锛�1闇�瑕侊紝0涓嶉渶瑕侊級")
- private String energyCheck;
+ private Boolean energyCheck;
/** 涓嶅啀鍗曠嫭杩涜鑺傝兘瀹℃煡鐨勭被鍨� */
@ApiModelProperty("涓嶅啀鍗曠嫭杩涜鑺傝兘瀹℃煡鐨勭被鍨�")
- private String noOnlyCheckType;
+ private Integer noOnlyCheckType;
/** 澶囨敞 */
@ApiModelProperty("澶囨敞")
--
Gitblit v1.8.0