From e1cc4a8ac8250d8f76d4d85f49b2b00a4047f0c9 Mon Sep 17 00:00:00 2001 From: jyy <jyy> Date: Sat, 11 Sep 2021 17:40:53 +0800 Subject: [PATCH] Merge branch 'score_shop' into api_score_meger --- zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanApplyVo.java | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanApplyVo.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanApplyVo.java index 6ea6b37..79acde3 100644 --- a/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanApplyVo.java +++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanApplyVo.java @@ -21,6 +21,10 @@ * 审核状态-3未通过 */ public static final int APPLY_STATUS_WTG = 3; + /** + * 审核状态-4系统删除 + */ + public static final int APPLY_STATUS_XTQX = 4; /** @@ -40,7 +44,8 @@ */ public static final int APPLY_WAY_HAND_ADD=4; - + @ApiModelProperty(value = "申请记录ID") + private Long id; @ApiModelProperty(value = "申请方式1、自主申请，2、自动添加，3上级邀请，4、手动添加(来源)") private Integer applyWay; @@ -69,10 +74,14 @@ private String nickname; @ApiModelProperty(value = "头像") private String avatarUrl; - @ApiModelProperty(value = "邀请人") + @ApiModelProperty(value = "注册邀请人") private String parentUser; - @ApiModelProperty(value = "下级客户数") + @ApiModelProperty(value = "当前上级") + private String parentUserNow; + @ApiModelProperty(value = "推广客户") private Integer lowerLevelNum; + @ApiModelProperty(value = "邀请下级") + private Integer invitedNum; @ApiModelProperty(value = "累计收益") private BigDecimal totalRevenue; -- Gitblit v1.9.1