From b1158d0bb5b453f0b8e5df143de92ee08d1e9048 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 27 Oct 2021 16:12:23 +0800
Subject: [PATCH] 修改赠送金额购买项目没打折的情况
---
zq-erp/src/main/java/com/matrix/system/activity/vo/CouponVo.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/activity/vo/CouponVo.java b/zq-erp/src/main/java/com/matrix/system/activity/vo/CouponVo.java
index 47ee4c1..39b64fa 100644
--- a/zq-erp/src/main/java/com/matrix/system/activity/vo/CouponVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/activity/vo/CouponVo.java
@@ -1,9 +1,10 @@
package com.matrix.system.activity.vo;
-import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.util.Date;
@Data
public class CouponVo {
@@ -23,7 +24,7 @@
* 结束时间
*/
@ApiModelProperty(value = "结束时间")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone="GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone="GMT+8")
private Date endTime;
}
--
Gitblit v1.9.1