From 62a87c9ed02a012eda78b70f67d56019039e7f41 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Fri, 17 Jun 2022 18:01:29 +0800 Subject: [PATCH] 20220528 --- src/main/java/cc/mrbird/febs/mall/vo/ApiMallActWinDetailsVo.java | 6 ++++++ src/main/resources/mapper/modules/MallActWinRecordMapper.xml | 1 + 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/vo/ApiMallActWinDetailsVo.java b/src/main/java/cc/mrbird/febs/mall/vo/ApiMallActWinDetailsVo.java index b6e2b93..5013737 100644 --- a/src/main/java/cc/mrbird/febs/mall/vo/ApiMallActWinDetailsVo.java +++ b/src/main/java/cc/mrbird/febs/mall/vo/ApiMallActWinDetailsVo.java @@ -1,8 +1,11 @@ package cc.mrbird.febs.mall.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; + +import java.util.Date; @Data @ApiModel(value = "ApiMallActWinDetailsVo", description = "返回参数类") @@ -16,5 +19,8 @@ private Integer awardType; @ApiModelProperty(value = "获得积分或佣金数量(奖金)") private Integer awardValue; + @ApiModelProperty(value = "中奖时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date createdTime; } diff --git a/src/main/resources/mapper/modules/MallActWinRecordMapper.xml b/src/main/resources/mapper/modules/MallActWinRecordMapper.xml index 9971138..2e3ee63 100644 --- a/src/main/resources/mapper/modules/MallActWinRecordMapper.xml +++ b/src/main/resources/mapper/modules/MallActWinRecordMapper.xml @@ -12,6 +12,7 @@ a.award_name awardName, a.award_type awardType, a.award_value awardValue, + a.created_time createdTime, b.award_image awardImage from mall_act_win_record a left join mall_act_award_set b on a.award_id = b.id -- Gitblit v1.9.1