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/resources/mapper/ProjectInvestmentPolicyComplianceMapper.xml | 21 ++++++--------------- 1 files changed, 6 insertions(+), 15 deletions(-) diff --git a/business/src/main/resources/mapper/ProjectInvestmentPolicyComplianceMapper.xml b/business/src/main/resources/mapper/ProjectInvestmentPolicyComplianceMapper.xml index f6df228..2ef6d19 100644 --- a/business/src/main/resources/mapper/ProjectInvestmentPolicyComplianceMapper.xml +++ b/business/src/main/resources/mapper/ProjectInvestmentPolicyComplianceMapper.xml @@ -5,21 +5,18 @@ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> <resultMap id="BaseResultMap" type="com.ycl.domain.vo.ProjectInvestmentPolicyComplianceVO"> <result column="project_id" property="projectId" /> - <result column="policy_compliance_attachment" property="policyComplianceAttachment" /> <result column="belongs_to_industry_adjustment_directory" property="belongsToIndustryAdjustmentDirectory" /> - <result column="belongs_to_allowed_projects" property="belongsToAllowedProjects" /> <result column="belongs_to_western_encouraged_directory" property="belongsToWesternEncouragedDirectory" /> <result column="not_banned_or_controlled_project" property="notBannedOrControlledProject" /> <result column="information_is_true" property="informationIsTrue" /> <result column="special_planning_compliance" property="specialPlanningCompliance" /> - <result column="energy_consumption" property="energyConsumption" /> <result column="annual_energy_consumption" property="annualEnergyConsumption" /> <result column="annual_electricity_consumption" property="annualElectricityConsumption" /> <result column="energy_check" property="energyCheck" /> <result column="no_only_check_type" property="noOnlyCheckType" /> <result column="remarks" property="remarks" /> - <result column="gmt_create_time" property="gmtCreateTime" /> - <result column="gmt_update_time" property="gmtUpdateTime" /> + <result column="gmt_create" property="gmtCreate" /> + <result column="gmt_update" property="gmtUpdate" /> <result column="create_by" property="createBy" /> <result column="update_by" property="updateBy" /> </resultMap> @@ -33,21 +30,18 @@ <select id="getById" resultMap="BaseResultMap"> SELECT TPIPC.project_id, - TPIPC.policy_compliance_attachment, TPIPC.belongs_to_industry_adjustment_directory, - TPIPC.belongs_to_allowed_projects, TPIPC.belongs_to_western_encouraged_directory, TPIPC.not_banned_or_controlled_project, TPIPC.information_is_true, TPIPC.special_planning_compliance, - TPIPC.energy_consumption, TPIPC.annual_energy_consumption, TPIPC.annual_electricity_consumption, TPIPC.energy_check, TPIPC.no_only_check_type, TPIPC.remarks, - TPIPC.gmt_create_time, - TPIPC.gmt_update_time, + TPIPC.gmt_create, + TPIPC.gmt_update, TPIPC.create_by, TPIPC.update_by, TPIPC.id @@ -61,21 +55,18 @@ <select id="getPage" resultMap="BaseResultMap"> SELECT TPIPC.project_id, - TPIPC.policy_compliance_attachment, TPIPC.belongs_to_industry_adjustment_directory, - TPIPC.belongs_to_allowed_projects, TPIPC.belongs_to_western_encouraged_directory, TPIPC.not_banned_or_controlled_project, TPIPC.information_is_true, TPIPC.special_planning_compliance, - TPIPC.energy_consumption, TPIPC.annual_energy_consumption, TPIPC.annual_electricity_consumption, TPIPC.energy_check, TPIPC.no_only_check_type, TPIPC.remarks, - TPIPC.gmt_create_time, - TPIPC.gmt_update_time, + TPIPC.gmt_create, + TPIPC.gmt_update, TPIPC.create_by, TPIPC.update_by, TPIPC.id -- Gitblit v1.8.0