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

jyy

2021-04-15 bb5be7a8a6ac24fbf66f03f070751577b87c95ca

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