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

jyy

2021-03-25 5857fd14f4608ace25724ba6386d72d210e20870

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

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

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