From fb6eee80334ae23a2eca8c37baeef05e86c919ed Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 10 十二月 2024 17:09:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 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 bf858fd..c251413 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
@@ -12,6 +12,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.List;
/**
* <p>
@@ -100,6 +101,18 @@
@ApiModelProperty(value = "绑定门店名称")
@TableField(exist = false)
private String shopName;
+ @ApiModelProperty(value = "绑定门店封面")
+ @TableField(exist = false)
+ private String shopCover;
+ @ApiModelProperty(value = "绑定门店地址")
+ @TableField(exist = false)
+ private String shopAddress;
+ @ApiModelProperty(value = "上级人员信息")
+ @TableField(exist = false)
+ private AppUser topUser;
+ @ApiModelProperty(value = "下级人员列表")
+ @TableField(exist = false)
+ private List<AppUser> bottomUsers;
@ApiModelProperty(value = "合伙人积分数")
@TableField("part_point")
@@ -149,10 +162,14 @@
@TableField("total_distribution_amount")
private BigDecimal totalDistributionAmount;
-
+
@ApiModelProperty(value = "剩余积分")
@TableField("lave_point")
private Integer lavePoint;
+
+ @ApiModelProperty(value = "总积分")
+ @TableField("total_point")
+ private Integer totalPoint;
@ApiModelProperty(value = "是否可更换推广人（0=否，1=是）")
@TableField("change_promoter")
@@ -189,28 +206,43 @@
@ApiModelProperty(value = "区编号")
@TableField("district_code")
private String districtCode;
+ @ApiModelProperty(value = "区编号")
+ @TableField("qr_code")
+ private String qrCode;
@ApiModelProperty("等级1会员数")
+ @TableField(exist = false)
private Long count1;
@ApiModelProperty("等级2会员数")
+ @TableField(exist = false)
private Long count2;
@ApiModelProperty("等级3会员数")
+ @TableField(exist = false)
private Long count3;
@ApiModelProperty("等级4会员数")
+ @TableField(exist = false)
private Long count4;
@ApiModelProperty("等级5会员数")
+ @TableField(exist = false)
private Long count5;
@ApiModelProperty("等级6会员数")
+ @TableField(exist = false)
private Long count6;
@ApiModelProperty("等级7会员数")
+ @TableField(exist = false)
private Long count7;
+ @ApiModelProperty("是否签到1是0否")
+ @TableField(exist = false)
+ private Integer isSign;
+
+
}
--
Gitblit v1.7.1