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

jyy

2021-06-09 ec87cf1ee2b9382bf9d089711f0ff82ae8e7077c

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

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

   @ApiModelProperty(value = "申请用户openId")
   private String  openId;
   
   @ApiModelProperty(value = "分销员")
   private String nickname;