Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-07-21 75f1c8f7380994e032de7d32ca7890dff543aaa2

 zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanOrder.java

@@ -55,14 +55,14 @@
    */


   private String  userId;
   private Long  userId;
   
   /**
    * 收益人id
    */


   private String  salesUserId;
   private Long  salesUserId;
   
   /**
    * 收益类型1，推广收益，2邀请收益