|
|
@@ -3,6 +3,7 @@ package com.ruoyi.system.dto;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
+import com.fasterxml.jackson.annotation.JsonFormat;
|
|
|
import com.fasterxml.jackson.annotation.JsonInclude;
|
|
|
import lombok.Data;
|
|
|
|
|
|
@@ -159,6 +160,7 @@ public class PromotionCalcResponse {
|
|
|
/** 是否与当前促销冲突 */
|
|
|
private Boolean conflictWithPromotion;
|
|
|
/** 过期时间 */
|
|
|
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Taipei")
|
|
|
private Date expireTime;
|
|
|
}
|
|
|
}
|