安全指数代码提交

project_data/sql/0.0.3/soc/soc.sql

@@ -525,3 +525,5 @@ UPDATE sys_dict_data set dict_label ='待登记' WHERE dict_label ='待演练' A
 -- 报警控制器
 ALTER TABLE `core_protection_log`
 MODIFY COLUMN `status_updator_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '上报人姓名' AFTER `status_updator_id`;
+-- 修改安全指数机构分数表机构path字段长度
+alter table core_safe_month_score modify org_path varchar(225) null comment '机构path';

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/vo/CoreDrillTaskDetailVo.java

@@ -65,11 +65,11 @@ public class CoreDrillTaskDetailVo {
     @ApiModelProperty(value = "计划任务截止日期")
     private LocalDateTime endDate;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     @ApiModelProperty(value = "演练时间")
     private LocalDateTime drillStartTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     @ApiModelProperty(value = "演练时间")
     private LocalDateTime drillEndTime;
 

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/edu/vo/CoreEduTrainingTaskDetailVo.java

@@ -65,11 +65,11 @@ public class CoreEduTrainingTaskDetailVo {
     @ApiModelProperty(value = "计划任务截止日期")
     private LocalDateTime endDate;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     @ApiModelProperty(value = "培训开始时间")
     private LocalDateTime trainingStartDateTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     @ApiModelProperty(value = "培训截止时间")
     private LocalDateTime trainingEndDateTime;