From fab70cc8c9cf774b6ce4db186de49b2a931941b2 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Fri, 26 Aug 2022 15:00:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF=E8=AF=84?=
 =?UTF-8?q?=E4=BC=B0-=E6=9D=A1=E6=AC=BE=E4=BF=A1=E6=81=AF=E8=AF=84?=
 =?UTF-8?q?=E4=BC=B0=E7=BB=93=E6=9E=9C=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/dev_third_record.sql                | 5 +++++
 .../entity/LawsTechnologyEvaluationItemResultEO.java         | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index 6a24c7bd5..c408ef57e 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -966,3 +966,8 @@ ADD COLUMN `related_areas_en` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4
 ADD COLUMN `source_cn` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源中文' AFTER `related_areas_en`,
 ADD COLUMN `time` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '日期' AFTER `source_cn`,
 ADD COLUMN `source_en` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源英文' AFTER `time`;
+
+
+-- 法规技术评估 条款项评估结果表增加字段。  2022-08-26
+ALTER TABLE `laws_weilai`.`laws_technology_evaluation_item_result`
+    ADD COLUMN `feedback_time` datetime NULL COMMENT '反馈时间' AFTER `laws_technology_evaluation_id`;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java
index 5ab32f3d2..770cf937b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java
@@ -135,6 +135,11 @@ public class LawsTechnologyEvaluationItemResultEO implements Serializable {
     @ApiModelProperty(value = "发起人反馈")
     private java.lang.String sponsorFeedback;
 
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "反馈时间")
+    private java.util.Date feedbackTime;
+
     /**法规技术评估表id*/
     @ApiModelProperty(value = "法规技术评估表id")
     private java.lang.String lawsTechnologyEvaluationId;