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/BalanceChangeRecord.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 4fc25b6..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;
@@ -21,7 +22,7 @@
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键")
- @TableId(type = IdType.AUTO)
+ @TableId
private Long id;
@ApiModelProperty("用户id")
@@ -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