From c743f4413a00fc063bbbd9d851b6d0c3fff10581 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 31 七月 2023 10:04:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/entity/UserIntegralChanges.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/entity/UserIntegralChanges.java b/cloud-server-account/src/main/java/com/dsh/account/entity/UserIntegralChanges.java
index 7930442..305748a 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/entity/UserIntegralChanges.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/entity/UserIntegralChanges.java
@@ -1,14 +1,14 @@
package com.dsh.account.entity;
-import com.baomidou.mybatisplus.enums.IdType;
+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 java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;
-import com.baomidou.mybatisplus.annotations.Version;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -37,26 +37,32 @@
/**
* 用户id
*/
+ @TableField("appUserId")
private Integer appUserId;
/**
* 积分类型（1=赠送积分，2=兑换商品，3=完成课后练习，4=观看教学视频）
*/
+ @TableField("type")
private Integer type;
/**
* 历史积分
*/
+ @TableField("oldIntegral")
private Integer oldIntegral;
/**
* 新积分
*/
+ @TableField("newIntegral")
private Integer newIntegral;
/**
* 备注
*/
+ @TableField("remark")
private String remark;
/**
* 添加时间
*/
+ @TableField("insertTime")
private Date insertTime;
--
Gitblit v1.7.1