fix conflect

wzy

2021-11-11 8f7460c6ddff45ec39bf2026d75a3f4e2b26f13d

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

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


   private Double  sealesCommission;

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

   private Double  selfCommission;

   
   /**
    * 邀请提成 %