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

openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/OpScheduleDto.java

@@ -1,5 +1,6 @@
 package com.openhis.web.clinicalmanage.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.openhis.surgicalschedule.domain.OpSchedule;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -55,6 +56,7 @@ public class OpScheduleDto extends OpSchedule {
     /**
      * 申请时间开始
      */
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
     private String applyTime;
 
     /**

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDto.java

@@ -100,10 +100,12 @@ public class IssueDto {
 
     /** 开始时间 */
     @NotNull
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
 
     /** 结束时间 */
     @NotNull
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
 
     /** 单价 */