Merge branch 'developer'

Helius

2022-03-04 ce6cc897ad5d817634b93937c34ce4a42a97be92

 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;