From 050ff0dfc04d4ca2a33ac0e97c98f042b9f95df6 Mon Sep 17 00:00:00 2001
From: li-guang <153605324@qq.com>
Date: Wed, 07 Apr 2021 11:56:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanApplyVo.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 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 3a3af3c..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
@@ -74,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