Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-08-13 911297338aece1dedcddd5caaaf875c51c793aec

 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;