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

jyy

2021-04-09 63170eb558babf81890cb23a453680e1054ecf85

 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;