Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-07 21db21a114356e0704a3483c1a3f22b96ea6658b

 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未通过")