fix conflect

Helius

2021-11-17 792a502dd95cadccbef8121673e6b5059a2c3550

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

@@ -33,6 +33,13 @@


   private Double  sealesCommission;

   /**
    * 自购返佣比例%
    */

   private Double  selfCommission;

   
   /**
    * 邀请提成 %