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/entity/ProjectInvestmentPolicyCompliance.java | 24 ++++++------------------
1 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/business/src/main/java/com/ycl/domain/entity/ProjectInvestmentPolicyCompliance.java b/business/src/main/java/com/ycl/domain/entity/ProjectInvestmentPolicyCompliance.java
index bc9563f..64bf1e5 100644
--- a/business/src/main/java/com/ycl/domain/entity/ProjectInvestmentPolicyCompliance.java
+++ b/business/src/main/java/com/ycl/domain/entity/ProjectInvestmentPolicyCompliance.java
@@ -23,37 +23,25 @@
/** 椤圭洰id */
private Long projectId;
- @TableField("policy_compliance_attachment")
- /** 绗﹀悎浜т笟鏀跨瓥闄勪欢 */
- private String policyComplianceAttachment;
-
@TableField("belongs_to_industry_adjustment_directory")
/** 鏄惁灞炰簬銆婁骇涓氱粨鏋勮皟鏁存寚瀵肩洰褰曘�嬩笅鐨勯」鐩� */
- private String belongsToIndustryAdjustmentDirectory;
-
- @TableField("belongs_to_allowed_projects")
- /** 鏄惁灞炰簬鏈垪鍏ャ�婁骇涓氱粨鏋勮皟鏁存寚瀵肩洰褰曘�嬬殑鍏佽绫婚」鐩� */
- private String belongsToAllowedProjects;
+ private Boolean belongsToIndustryAdjustmentDirectory;
@TableField("belongs_to_western_encouraged_directory")
/** 鏄惁灞炰簬銆婅タ閮ㄥ湴鍖洪紦鍔辩被浜т笟鐩綍銆嬬殑椤圭洰 */
- private Integer belongsToWesternEncouragedDirectory;
+ private Boolean belongsToWesternEncouragedDirectory;
@TableField("not_banned_or_controlled_project")
/** 鏄惁涓嶅睘浜庝骇涓氭斂绛栫姝㈡姇璧勫缓璁炬垨瀹炶鏍稿噯銆佸鎵圭鐞嗙殑椤圭洰 */
- private Integer notBannedOrControlledProject;
+ private Boolean notBannedOrControlledProject;
@TableField("information_is_true")
/** 濉姤淇℃伅鏄惁鐪熷疄 */
- private Integer informationIsTrue;
+ private Boolean informationIsTrue;
@TableField("special_planning_compliance")
/** 涓撻」瑙勫垝澶嶅悎鎯呭喌 */
private String specialPlanningCompliance;
-
- @TableField("energy_consumption")
- /** 椤圭洰鑳借�楁儏鍐� */
- private String energyConsumption;
@TableField("annual_energy_consumption")
/** 椤圭洰骞寸患鍚堣兘婧愭秷璐归噺锛堟爣鍑嗙叅褰撻噺鍊硷級 */
@@ -65,11 +53,11 @@
@TableField("energy_check")
/** 鑺傝兘瀹℃煡锛�1闇�瑕侊紝0涓嶉渶瑕侊級 */
- private String energyCheck;
+ private Boolean energyCheck;
@TableField("no_only_check_type")
/** 涓嶅啀鍗曠嫭杩涜鑺傝兘瀹℃煡鐨勭被鍨� */
- private String noOnlyCheckType;
+ private Integer noOnlyCheckType;
@TableField("remarks")
/** 澶囨敞 */
--
Gitblit v1.8.0