Merge remote-tracking branch 'origin/master'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/program/configuration/projectList/domain/ProgramProjectListInfo.java

@@ -318,8 +318,8 @@ public class ProgramProjectListInfo {
     /**
      * 审批通过时间
      */
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date agreeTime;
 
     /**

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/proofread/domain/ProofreadIssued.java

@@ -108,11 +108,16 @@ public class ProofreadIssued extends BaseEntity {
     /**
      * 审批通过时间
      */
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date agreeTime;
 
     /**
+     * 审批人id
+     */
+    private String agreeUserId;
+
+    /**
      * 流程id
      */
     private String procInsId;

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/proofread/mapper/xml/ProofreadIssuedMapper.xml

@@ -28,6 +28,7 @@
 			a.consulting_report,
 			a.status,
 			a.agree_time,
+			a.agree_user_id,
 			a.proc_ins_id,
 			a.process_definition_id
 		FROM