Merge remote-tracking branch 'origin/master'

huangzhen

2023-09-26 7a393cea127859281a4edd08d6f75630a8d429a5

 exam-system/src/main/java/com/gkhy/exam/noncoalmine/entity/WorkRegistration.java

@@ -33,7 +33,7 @@
    //IC卡编号
    private String icNum;
    //作业时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date workTime;
    //所属单位
    private String dept;