From 13c342a675054bcc3aba374ec9e368446c2d639a Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期一, 16 十二月 2024 16:33:04 +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 9792ae1..0d93b14 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; @@ -30,7 +31,7 @@ @ApiModelProperty("订单id") private Long orderId; - @ApiModelProperty("类型:1充值2提现3红包4分佣5商城购物") + @ApiModelProperty("类型:1充值2提现3红包4分佣5商城购物6订单取消回退") private Integer changeType; @ApiModelProperty("变更前金额") @@ -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