From 5592de9cf80aa78486775a72a6224973c93146da Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 08 八月 2023 17:25:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/entity/UserIntegralChanges.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 305748a..6e91161 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
@@ -32,8 +32,8 @@
/**
* 主键
*/
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ @TableId(value = "id", type = IdType.NONE)
+ private Long id;
/**
* 用户id
*/
@@ -64,7 +64,11 @@
*/
@TableField("insertTime")
private Date insertTime;
-
+ /**
+ * 变动类型（1增加 2扣除）
+ */
+ @TableField("category")
+ private Integer category;
@Override
protected Serializable pkVal() {
--
Gitblit v1.7.1