Merge remote-tracking branch 'origin/developerA' into developerA

src/main/java/com/caimei/www/pojo/document/OssArchivePdf.java

@@ -1,5 +1,6 @@
 package com.caimei.www.pojo.document;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -43,6 +44,7 @@ public class OssArchivePdf implements Serializable {
     /**
      * 上传时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date uploadTime;
 
     /**