Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

Helius

2021-06-29 2a53d6814b43d58d3b8b373fe2690f68e2e912a8

 gc-order/src/main/java/com/xzx/gc/order/dto/AddJhyOrderDto.java

@@ -17,7 +17,7 @@
    @ApiModelProperty(value = "地址ID")
    private Long addressId;

//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    @ApiModelProperty(value = "预约日期")
    private Date reserveDate;