Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-06-18 0de4720110cc7ce35d1565bdd5706d6b9a0b3982

 zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanAppliingVo.java

@@ -13,6 +13,7 @@
   
   @ApiModelProperty(value = "申请用户id")
   private String  userId;

   
   @ApiModelProperty(value = "分销员")
   private String nickname;