From 609d91e1e62b1e8932b34b15b09baf02e7f09a93 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 09 十二月 2024 10:36:47 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

---
 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserPoint.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserPoint.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserPoint.java
index 9a98d9d..89d0ba8 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserPoint.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserPoint.java
@@ -38,11 +38,15 @@
 
     @ApiModelProperty(value = "历史余额")
     @TableField("historical_point")
-    private BigDecimal historicalPoint;
+    private Integer historicalPoint;
 
     @ApiModelProperty(value = "变动金额")
     @TableField("variable_point")
-    private BigDecimal variablePoint;
+    private Integer variablePoint;
+
+    @ApiModelProperty(value = "变动后余额")
+    @TableField("balance")
+    private Integer balance;
 
     @ApiModelProperty(value = "变动时间")
     @TableField("create_time")

--
Gitblit v1.7.1