From f18a802137a7642473891f6886d44cf0c229efed Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期六, 11 一月 2025 18:09:10 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java index 88b9f9e..687f9cd 100644 --- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java +++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java @@ -228,6 +228,14 @@ @TableField("available_point") private Integer availablePoint; + @ApiModelProperty(value = "可用总积分数") + @TableField("total_available_point") + private Integer totalAvailablePoint; + + @ApiModelProperty(value = "可转增积分") + @TableField("transferable_point") + private Integer transferablePoint; + @ApiModelProperty(value = "是否可更换推广人(0=否,1=是)") @TableField("change_promoter") private Integer changePromoter; @@ -303,7 +311,7 @@ @TableField(exist = false) private Set<Integer> shopIds; - @ApiModelProperty(value = "降级预警") + @ApiModelProperty(value = "降级预警(0=否,1=是)") @TableField("is_danger") private Integer isDanger; -- Gitblit v1.7.1