Merge branch 'score_shop' into api_score_meger

jyy

2021-08-02 b72820410a7989da5c645bedb849dc7cccb8faed

 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;