From 8287f743a1ac2fd5330f6dd7ca08255df193ae03 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Fri, 09 Jul 2021 20:50:16 +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 |    4 +++-
 1 files changed, 3 insertions(+), 1 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 7220655..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,8 +74,10 @@
 	private String nickname;
 	@ApiModelProperty(value = "头像")
 	private String avatarUrl;
-	@ApiModelProperty(value = "邀请人")
+	@ApiModelProperty(value = "注册邀请人")
 	private String parentUser;
+	@ApiModelProperty(value = "当前上级")
+	private String parentUserNow;
 	@ApiModelProperty(value = "推广客户")
 	private Integer lowerLevelNum;
 	@ApiModelProperty(value = "邀请下级")

--
Gitblit v1.9.1