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

dxhy-core/src/main/java/com/dxhy/core/model/mailGather/MailGatherLogVo.java

@@ -27,9 +27,9 @@ public class MailGatherLogVo extends CommonDTO {
     private String ocrType;
     private String errorMsg;
     private String fileName;
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
+    private String cjsj;
 
 
     public String deptId;

dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/MailGatherLogServiceImpl.java

@@ -7,6 +7,7 @@ import com.dxhy.common.constant.DbConstant;
 import com.dxhy.common.datasource.config.DynamicContextHolder;
 import com.dxhy.common.util.UUIDUtils;
 import com.dxhy.common.utils.Base64Encoding;
+import com.dxhy.common.utils.DateUtils;
 import com.dxhy.core.dao.mailGather.MailGatherLogDao;
 import com.dxhy.core.model.mailGather.EmailMaintainVo;
 import com.dxhy.core.model.mailGather.MailGatherLogVo;
@@ -58,6 +59,7 @@ public class MailGatherLogServiceImpl implements MailGatherLogService {
         if(emailMaintainVos !=null && emailMaintainVos.size() > 0) {
             for (int i = 0; i < emailMaintainVos.size(); i++) {
                 MailGatherLogVo mailGatherLogVo = emailMaintainVos.get(i);
+                mailGatherLogVo.setCjsj(DateUtils.dateToStr(mailGatherLogVo.getCreateTime()));
                 mailGatherLogVo.setXh(i + 1 + "");
             }
         }

dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.java

@@ -657,7 +657,7 @@ public class SignFpqsController extends AbstractController {
         int size = (int)pramsMap.get("size");
         try {
             log.info("签收列表查询参数 {}",data);
-            log.info("返回结果为 {}",signFpqsService.selectQsfpList(data,curr,size));
+//            log.info("返回结果为 {}",signFpqsService.selectQsfpList(data,curr,size));
             return ResponseEntity.ok(R.ok().put("data", signFpqsService.selectQsfpList(data, curr, size)));
         } catch (Exception e) {
             e.printStackTrace();