From 0dfecde9ebe89ec797b273823c52e44baf056df6 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期一, 24 六月 2024 09:51:54 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/DolphinEnglish --- ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TIntegralRecord.java | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TIntegralRecord.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TIntegralRecord.java index b593a17..92f08f5 100644 --- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TIntegralRecord.java +++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TIntegralRecord.java @@ -1,11 +1,15 @@ package com.ruoyi.study.domain; 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.ruoyi.common.core.web.domain.BaseModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; + +import java.util.Date; /** * <p> @@ -54,6 +58,11 @@ @ApiModelProperty("故事id 对应t_story_listen") private Integer storyId; + @ApiModelProperty("积分变动时间") + @TableField(exist = false) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") + private Date time; + /** * 前端用,返回积分变动类型 * @@ -62,4 +71,8 @@ public String getType() { return integral.startsWith("-") ? "减少" : "增加"; } + + public Date getTime() { + return super.getCreateTime(); + } } -- Gitblit v1.7.1