Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-04-20 c57c5f9843dcd99d908aa3b6bddb0c3793ebf3e9

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