Merge remote-tracking branch 'origin/master'

f5170068 · zhangjianqian · abdad97f · c9c0c5c0 · f5170068
Commit f5170068 authored Jan 06, 2023 by zhangjianqian
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

TTrainUserCourse.java .../main/java/com/zehong/system/domain/TTrainUserCourse.java +1 -1

No files found.
--- a/danger-manage-system/src/main/java/com/zehong/system/domain/TTrainUserCourse.java
+++ b/danger-manage-system/src/main/java/com/zehong/system/domain/TTrainUserCourse.java
@@ -33,7 +33,7 @@ public class TTrainUserCourse extends BaseEntity
    private Integer state;

    /** 最后一次考试时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "最后一次考试时间", width = 30, dateFormat = "yyyy-MM-dd")
    private Date examinationTime;