From b3c381a111e11ae26066639a28b7a0d779abcddb Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 09 十二月 2024 15:31:28 +0800
Subject: [PATCH] 合并代码
---
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