Merge remote-tracking branch 'origin/master'

31c4522b · lizhichao · 05bed420 · 1a688c31 · 31c4522b
Commit 31c4522b authored Oct 21, 2022 by lizhichao
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

TNfcRecord.java ...em/src/main/java/com/zehong/system/domain/TNfcRecord.java +1 -1

No files found.
--- a/danger-manage-system/src/main/java/com/zehong/system/domain/TNfcRecord.java
+++ b/danger-manage-system/src/main/java/com/zehong/system/domain/TNfcRecord.java
@@ -43,7 +43,7 @@ public class TNfcRecord extends BaseEntity {
    private String remarks;

    /**上报时间*/
-    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    /**