修改oa中其他审批单继承基础的表单

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaForm.java

@@ -1,9 +1,12 @@
 package com.yxt.anrui.oa.biz.oaform;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @description:
  * @author: dimengzhe
@@ -23,8 +26,9 @@ public class OaForm extends BaseEntity {
     private String deptSid;
     @ApiModelProperty("部门名称")
     private String deptName;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @ApiModelProperty("办结日期")
-    private String finishTime;
+    private Date finishTime;
     @ApiModelProperty("实例id")
     private String procInstId;
     @ApiModelProperty("流程定义id")

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaleaveapply/OaLeaveApply.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.oa.biz.oaleaveapply;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.anrui.oa.biz.oaform.OaForm;
 import com.yxt.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.util.Date;
@@ -49,7 +50,7 @@ import lombok.Data;
 @Data
 @ApiModel(value = "请假申请", description = "请假申请")
 @TableName("oa_leave_apply")
-public class OaLeaveApply extends BaseEntity {
+public class OaLeaveApply extends OaForm {
     private static final long serialVersionUID = 1L;
 
 	@ApiModelProperty("单据编号")

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApply.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.oa.biz.oamendapply;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.anrui.oa.biz.oaform.OaForm;
 import com.yxt.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.util.Date;
@@ -49,7 +50,7 @@ import lombok.Data;
 @Data
 @ApiModel(value = "补卡申请", description = "补卡申请")
 @TableName("oa_mend_apply")
-public class OaMendApply extends BaseEntity {
+public class OaMendApply extends OaForm {
     private static final long serialVersionUID = 1L;
 
 	@ApiModelProperty("单据编号")