From e737388fe3c1f74ede190a4637c8394109bb687b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 28 Jun 2021 17:51:31 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

---
 gc-order/src/main/java/com/xzx/gc/order/dto/AddJhyOrderDto.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/gc-order/src/main/java/com/xzx/gc/order/dto/AddJhyOrderDto.java b/gc-order/src/main/java/com/xzx/gc/order/dto/AddJhyOrderDto.java
index 5bff938..81ebc3f 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/dto/AddJhyOrderDto.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/dto/AddJhyOrderDto.java
@@ -1,5 +1,6 @@
 package com.xzx.gc.order.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -13,6 +14,7 @@
     @ApiModelProperty(value = "地址ID")
     private Long addressId;
 
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "预约日期")
     private Date reserveDate;
 

--
Gitblit v1.9.1