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/entity/ShopSalesmanApply.java

@@ -54,11 +54,11 @@
   private Integer  applyWay;

   @ApiModelProperty(value = "申请用户id")
   private String  userId;
   private Long  userId;
   

   @ApiModelProperty(value = "邀请用户ID")
   private String  parentUserId;
   private Long  parentUserId;
   

   @ApiModelProperty(value = "申请状态1、待审核，2通过，3未通过")