From 2cad3b644a32880cfaf52f87bf6add621db81842 Mon Sep 17 00:00:00 2001
From: zhongrj <123456>
Date: Mon, 05 Dec 2022 15:01:25 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfptht-public

---
 src/main/java/org/springblade/modules/integral/entity/Integral.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/integral/entity/Integral.java b/src/main/java/org/springblade/modules/integral/entity/Integral.java
index 6488fca..48e2d5e 100644
--- a/src/main/java/org/springblade/modules/integral/entity/Integral.java
+++ b/src/main/java/org/springblade/modules/integral/entity/Integral.java
@@ -40,12 +40,12 @@
 
 	private static final long serialVersionUID = 1L;
 
-	private Integer id;
+	private Long id;
 	/**
 	 * 用户id
 	 */
 	@ApiModelProperty(value = "用户id")
-	private Integer uid;
+	private Long uid;
 	/**
 	 * 获取途径
 	 */
@@ -63,6 +63,10 @@
 	 */
 	@ApiModelProperty(value = "积分")
 	private Integer integral;
+	/**
+	 * 类型
+	 */
+	private String type;
 
 
 }

--
Gitblit v1.9.3