Merge branch 'feature-zxh-20211109-替换券码查询接口-1039131' into qa

order-application-service/src/main/java/cn/freemud/entities/dto/coupon/FastTemplateInfoResponseVO.java

@@ -2,6 +2,7 @@ package cn.freemud.entities.dto.coupon;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -26,15 +27,19 @@ public class FastTemplateInfoResponseVO {
     private Integer subType;
 
     @ApiModelProperty(value = "固定有效期开始时间，格式YYYY-MM-DD HH:mm:ss", required = true)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date effectiveStartTime;
 
     @ApiModelProperty(value = "固定有效结束时间，格式YYYY-MM-DD HH:mm:ss", required = true)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date effectiveEndTime;
 
     @ApiModelProperty(value = "领券结束时间，格式YYYY-MM-DD HH:mm:ss", required = true)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date receiveEndTime;
 
     @ApiModelProperty(value = "领券开始时间，格式YYYY-MM-DD HH:mm:ss", required = true)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date receiveStartTime;
 
     @ApiModelProperty(value = "启用金额，单位：分", required = true)

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/coupon/FastTemplateInfoResponseVO.java

@@ -2,6 +2,7 @@ package cn.freemud.entities.dto.coupon;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -26,15 +27,19 @@ public class FastTemplateInfoResponseVO {
     private Integer subType;
 
     @ApiModelProperty(value = "固定有效期开始时间，格式YYYY-MM-DD HH:mm:ss", required = true)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date effectiveStartTime;
 
     @ApiModelProperty(value = "固定有效结束时间，格式YYYY-MM-DD HH:mm:ss", required = true)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date effectiveEndTime;
 
     @ApiModelProperty(value = "领券结束时间，格式YYYY-MM-DD HH:mm:ss", required = true)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date receiveEndTime;
 
     @ApiModelProperty(value = "领券开始时间，格式YYYY-MM-DD HH:mm:ss", required = true)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date receiveStartTime;
 
     @ApiModelProperty(value = "启用金额，单位：分", required = true)