Merge remote-tracking branch 'origin/master'

ruoyi-system/src/main/java/com/ruoyi/system/domain/KaoqinConfig.java

@@ -49,22 +49,22 @@ public class KaoqinConfig extends BaseEntity
     private String kaSort;
 
     /** 打卡时间 -上午上班 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "HH:mm:ss")
     @Excel(name = "打卡时间 -上午上班", width = 30, dateFormat = "yyyy-MM-dd")
     private Date kaTimeAmIn;
 
     /** 打卡时间 -上午下班 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "HH:mm:ss")
     @Excel(name = "打卡时间 -上午下班", width = 30, dateFormat = "yyyy-MM-dd")
     private Date kaTimeAmOut;
 
     /** 打卡时间 -下午上班 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "HH:mm:ss")
     @Excel(name = "打卡时间 -下午上班", width = 30, dateFormat = "yyyy-MM-dd")
     private Date kaTimePmIn;
 
     /** 打卡时间 -下午下班 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "HH:mm:ss")
     @Excel(name = "打卡时间 -下午下班", width = 30, dateFormat = "yyyy-MM-dd")
     private Date kaTimePmOut;