From a981c07d34edd0975b9d556d97c1f851ce79974c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 04 十二月 2024 13:40:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/BalanceChangeRecord.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/BalanceChangeRecord.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/BalanceChangeRecord.java
index 8de1bfd..a3a839d 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/BalanceChangeRecord.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/BalanceChangeRecord.java
@@ -1,6 +1,7 @@
package com.ruoyi.account.api.model;
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 io.swagger.annotations.ApiModel;
@@ -31,7 +32,7 @@
private Long orderId;
@ApiModelProperty("类型：1充值2提现3红包4分佣5商城购物")
- private Integer type;
+ private Integer changeType;
@ApiModelProperty("变更前金额")
private BigDecimal beforeAmount;
@@ -47,4 +48,13 @@
@ApiModelProperty("添加时间")
private LocalDateTime createTime;
+
+ @TableField(exist = false)
+ @ApiModelProperty("消费用户名称")
+ private String userName;
+
+ @TableField(exist = false)
+ @ApiModelProperty("消费金额")
+ private BigDecimal amount;
+
}
--
Gitblit v1.7.1