diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsFlashPromotionSession.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsFlashPromotionSession.java index 8e0b685..e50b5a8 100644 --- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsFlashPromotionSession.java +++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsFlashPromotionSession.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.zscat.mallplus.utils.BaseEntity; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -41,6 +42,8 @@ public class SmsFlashPromotionSession extends BaseEntity implements Serializable * 每日开始时间 */ @DateTimeFormat(pattern = "HH:mm:ss") +// @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT") @TableField("start_time") private Date startTime; @@ -48,6 +51,8 @@ public class SmsFlashPromotionSession extends BaseEntity implements Serializable * 每日结束时间 */ @DateTimeFormat(pattern = "HH:mm:ss") +// @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT") @TableField("end_time") private Date endTime; diff --git a/mallplusui-uniapp-app2/pages/index/index.vue b/mallplusui-uniapp-app2/pages/index/index.vue index 3d6d8f0..1a025e6 100644 --- a/mallplusui-uniapp-app2/pages/index/index.vue +++ b/mallplusui-uniapp-app2/pages/index/index.vue @@ -33,15 +33,15 @@ - + 惠农套餐 - + 拼团特价 - + 限时抢购 diff --git a/mallplusui-uniapp-app2/pagesA/product/tag.vue b/mallplusui-uniapp-app2/pagesA/product/tag.vue index 7b1a853..89612aa 100644 --- a/mallplusui-uniapp-app2/pagesA/product/tag.vue +++ b/mallplusui-uniapp-app2/pagesA/product/tag.vue @@ -9,7 +9,7 @@ - +