From 97d99b76bdde8952cf257c3c85c1a8a080927af4 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期一, 31 三月 2025 16:44:22 +0800 Subject: [PATCH] 修改反馈文档bug --- ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserPoint.java | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 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 047d64f..b30e367 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 @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiParam; @@ -38,24 +39,19 @@ private Long id; @ApiModelProperty(value = "变动类型(1-消费,2-返佣,3-拉新,4-每日分享,5-每日签到,6-使用时长, 7-注册积分, 8-门店业绩," + - "9-门店返佣,10-技师业绩,11-兑换商品,12-他人赠送,13-赠与他人)") + "9-门店返佣,14-下级门店返佣,10-技师业绩,11-兑换商品,12-他人赠送,13-赠与他人,15-兑换券)") + @Excel(name = "变动类型", readConverterExp = "1=消费积分,2=返佣积分,3=拉新人积分,4=每日分享,5=每日签到,6=使用时长,7=注册积分,8=门店业绩,9=门店返佣,14=下级门店返佣,10=技师业绩,11=兑换商品,12=他人赠送,13=赠与他人,15=兑换券") @TableField("type") private Integer type; - @ApiModelProperty(value = "历史余额") - @TableField("historical_point") - private Integer historicalPoint; - @ApiModelProperty(value = "变动金额") @TableField("variable_point") + @Excel(name = "变动金额") private Integer variablePoint; - - @ApiModelProperty(value = "变动后余额") - @TableField("balance") - private Integer balance; @ApiModelProperty(value = "变动时间") @TableField("create_time") + @Excel(name = "变动时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; @ApiModelProperty(value = "变动用户id") @@ -69,12 +65,23 @@ @ApiModelProperty(value = "拓展字段") @TableField("extention") private String extention; + + @ApiModelProperty(value = "变动方向(-1:减少,1:增加)") + @TableField("change_direction") + private Integer changeDirection; + + @ApiModelProperty(value = "用户名称") + @Excel(name = "用户名称") @TableField(exist = false) private String userName; + @ApiModelProperty(value = "变动类型 0未变化1增加2减少") + @TableField(exist = false) + private Integer variableType; @ApiModelProperty(value = "联系电话") + @Excel(name = "联系电话") @TableField(exist = false) private String phone; -- Gitblit v1.7.1