diff --git a/src/main/java/com/kiisoo/ic/activity/bean/ActivityInstanceVO.java b/src/main/java/com/kiisoo/ic/activity/bean/ActivityInstanceVO.java index ab01a63..750d918 100644 --- a/src/main/java/com/kiisoo/ic/activity/bean/ActivityInstanceVO.java +++ b/src/main/java/com/kiisoo/ic/activity/bean/ActivityInstanceVO.java @@ -35,12 +35,12 @@ public class ActivityInstanceVO { @ApiModelProperty(value = "活动开始日期", required = true) @NotNull(message = "请输入活动开始日期") - @JsonFormat(pattern="yyyy-MM-dd") + @JsonFormat(pattern="yyyy-MM-dd", timezone = "GMT+8") private Date beginTime; @ApiModelProperty(value = "活动结束日期", required = true) @NotNull(message = "请输入活动结束日期") - @JsonFormat(pattern="yyyy-MM-dd") + @JsonFormat(pattern="yyyy-MM-dd", timezone = "GMT+8") private Date endTime; @ApiModelProperty(value = "活动类型,多选项", required = true) diff --git a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnPromotionSrcServiceImpl.java b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnPromotionSrcServiceImpl.java index 287b29a..0f38fc2 100644 --- a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnPromotionSrcServiceImpl.java +++ b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnPromotionSrcServiceImpl.java @@ -179,6 +179,7 @@ public class PmnPromotionSrcServiceImpl extends ServiceImpl