Merge branch 'ty_fix' into alpha

Helius

2021-11-09 51c026156e7e0cd75805ef7b61f6dc6eeab7afb6

 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;