Merge branch 'developer'

姜友瑶

2022-05-30 d7b7ccaac1d84ecd1934eab97c0fef57bd2a847d

 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;