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

jyy

2021-07-09 8287f743a1ac2fd5330f6dd7ca08255df193ae03

 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邀请收益