Merge remote-tracking branch 'origin/master'

zjugis-business/src/main/java/com/zjugis/business/flow/leave/controller/vo/LeaveBaseVO.java

@@ -53,8 +53,4 @@ public class LeaveBaseVO {
     @Schema(description = "请假原因")
     private String leaveReason;
 
-    @Schema(description = "申请时间")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
 }

zjugis-business/src/main/java/com/zjugis/business/flow/leave/controller/vo/LeaveRespVO.java

@@ -1,10 +1,13 @@
 package com.zjugis.business.flow.leave.controller.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -21,6 +24,11 @@ public class LeaveRespVO extends LeaveBaseVO{
     @Schema(description = "主键ID")
     private String id;
 
+    @Schema(description = "申请时间")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
     @Schema(description = "明细数据请假时间")
     private List<LeaveTimeCreateReqVO> leaveTimeCreateList;
 }