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

935090232@qq.com

2021-07-15 4ca3ceaa2b0f09f2221ee6714918baf5faee4bad

 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;