From 402aba359adb4b10cfa98ad7fcb424eb55641129 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 04 七月 2024 15:54:52 +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 | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 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 5342736..6922031 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,9 +1,6 @@
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.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.web.domain.BaseModel;
import io.swagger.annotations.ApiModelProperty;
@@ -64,11 +61,19 @@
@ApiModelProperty("故事id 对应t_story_listen")
private Integer storyId;
- @ApiModelProperty("积分变动时间")
- @TableField(exist = false)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
- private Date time;
+ /**
+ * 故事id
+ */
+ @ApiModelProperty("故事类型(0:看图配音；1:框架记忆)")
+ private Integer storyType;
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "积分变动时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ @TableField(value = "createTime", fill = FieldFill.INSERT)
+ private Date createTime;
/**
--
Gitblit v1.7.1