Merge branch 'develop' of gitadmin/tuoheng_lc into release

tuoheng-admin/src/main/java/com/tuoheng/admin/entity/vo/WarningVO.java

@@ -21,8 +21,8 @@ public class WarningVO {
     /**
      * 预警时间
      */
-    @DateTimeFormat(pattern = "yyyy.MM.dd hh:mm:ss")
-    @JsonFormat(pattern = "yyyy.MM.dd hh:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy.MM.dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy.MM.dd HH:mm:ss", timezone = "GMT+8")
     private Date waringTime;
 
     /**