Merge branch 'feature/20210603-v2.0.33-订单获取预计送达时间ID1030763-周晓航' into qa

0173d6fc · 周晓航 · 97a50863 · 356434cd · 0173d6fc
Commit 0173d6fc authored Jun 22, 2021 by 周晓航
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

order-application-service/src/main/java/cn/freemud/entities/dto/store/StoreCBaseResponseDto.java
+1 -1

No files found.
--- a/order-application-service/src/main/java/cn/freemud/entities/dto/store/StoreCBaseResponseDto.java
+++ b/order-application-service/src/main/java/cn/freemud/entities/dto/store/StoreCBaseResponseDto.java
@@ -14,7 +14,7 @@ import java.util.Date;
 @Data
 public class StoreCBaseResponseDto {

-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
    private Date expectArriveTime;

 }