From d2542a6123fa6834e01ed3af23c7ba0a02696bc6 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期五, 29 十一月 2024 16:37:02 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 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 c8cfc28..026c52b 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 @@ -85,10 +85,18 @@ @ApiModelProperty(value = "推广人id") @TableField("invite_user_id") private Long inviteUserId; + @ApiModelProperty(value = "推广人姓名") + @TableField(exist = false) + private String inviteUserName; + + @ApiModelProperty(value = "绑定门店id") @TableField("shop_id") private Long shopId; + @ApiModelProperty(value = "绑定门店名称") + @TableField(exist = false) + private String shopName; @ApiModelProperty(value = "合伙人积分数") @TableField("part_point") @@ -174,4 +182,27 @@ @TableField("district_code") private String districtCode; + @ApiModelProperty("等级1会员数") + private Long count1; + + @ApiModelProperty("等级2会员数") + private Long count2; + + @ApiModelProperty("等级3会员数") + private Long count3; + + @ApiModelProperty("等级4会员数") + private Long count4; + + @ApiModelProperty("等级5会员数") + private Long count5; + + @ApiModelProperty("等级6会员数") + private Long count6; + + @ApiModelProperty("等级7会员数") + private Long count7; + + + } -- Gitblit v1.7.1