Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-20 fa791f7796c1546b1329b52a3de8d753915cb4d5

 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 = "邀请下级")