|  | @@ -1,5 +1,6 @@
 | 
											
												
													
														|  |  package com.hwrj.cloud.portal.model;
 |  |  package com.hwrj.cloud.portal.model;
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | 
 |  | +import com.fasterxml.jackson.annotation.JsonFormat;
 | 
											
												
													
														|  |  import io.swagger.annotations.ApiModel;
 |  |  import io.swagger.annotations.ApiModel;
 | 
											
												
													
														|  |  import io.swagger.annotations.ApiModelProperty;
 |  |  import io.swagger.annotations.ApiModelProperty;
 | 
											
												
													
														|  |  import java.io.Serializable;
 |  |  import java.io.Serializable;
 | 
											
										
											
												
													
														|  | @@ -16,7 +17,7 @@ public class OmsOrder implements Serializable {
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |      @ApiModelProperty(value = "订单编号")
 |  |      @ApiModelProperty(value = "订单编号")
 | 
											
												
													
														|  |      private String orderSn;
 |  |      private String orderSn;
 | 
											
												
													
														|  | -
 |  | 
 | 
											
												
													
														|  | 
 |  | +    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
 | 
											
												
													
														|  |      @ApiModelProperty(value = "提交时间")
 |  |      @ApiModelProperty(value = "提交时间")
 | 
											
												
													
														|  |      private Date createTime;
 |  |      private Date createTime;
 | 
											
												
													
														|  |  
 |  |  
 | 
											
										
											
												
													
														|  | @@ -125,15 +126,19 @@ public class OmsOrder implements Serializable {
 | 
											
												
													
														|  |      @ApiModelProperty(value = "支付时间")
 |  |      @ApiModelProperty(value = "支付时间")
 | 
											
												
													
														|  |      private Date paymentTime;
 |  |      private Date paymentTime;
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | 
 |  | +    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
 | 
											
												
													
														|  |      @ApiModelProperty(value = "发货时间")
 |  |      @ApiModelProperty(value = "发货时间")
 | 
											
												
													
														|  |      private Date deliveryTime;
 |  |      private Date deliveryTime;
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | 
 |  | +    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
 | 
											
												
													
														|  |      @ApiModelProperty(value = "确认收货时间")
 |  |      @ApiModelProperty(value = "确认收货时间")
 | 
											
												
													
														|  |      private Date receiveTime;
 |  |      private Date receiveTime;
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | 
 |  | +    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
 | 
											
												
													
														|  |      @ApiModelProperty(value = "评价时间")
 |  |      @ApiModelProperty(value = "评价时间")
 | 
											
												
													
														|  |      private Date commentTime;
 |  |      private Date commentTime;
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | 
 |  | +    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
 | 
											
												
													
														|  |      @ApiModelProperty(value = "修改时间")
 |  |      @ApiModelProperty(value = "修改时间")
 | 
											
												
													
														|  |      private Date modifyTime;
 |  |      private Date modifyTime;
 | 
											
												
													
														|  |  
 |  |  
 |