fix conflect

Helius

2021-11-17 792a502dd95cadccbef8121673e6b5059a2c3550

 zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanGradeDao.xml

@@ -49,6 +49,7 @@
      SELECT
         a.id id,
         a.name name,
         a.self_commission selfCommission,
         a.seales_commission sealesCommission,
         a.invitation_commission invitationCommission,
         a.grade_condition gradeCondition,