Merge branch 'ty_fix' of http://120.27.238.55:7000/r/beauty-erp into ty_fix

Helius

2021-11-30 d4c997972509c2da06b1128086b1735597823d3f

 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;