Merge remote-tracking branch 'origin/release-sy-v1.0.0' into release-sy-v1.0.0

1 year ago · 8a370548d7
1 changed files with 2 additions and 2 deletions
--- a/shuili-system/src/main/java/com/kms/yg/znjg/domain/SySceneConfigRelation.java
+++ b/shuili-system/src/main/java/com/kms/yg/znjg/domain/SySceneConfigRelation.java
@ -32,8 +32,8 @@ public class SySceneConfigRelation implements Serializable {
    /**
     * 初始时间
     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy/MM/dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "HH:mm")
+    @JsonFormat(pattern = "HH:mm", timezone = "GMT+8")
    private Date initTime;

    /**