Merge branch 'score_shop' into api_score_meger

jyy

2021-04-26 ebbe59b6ee3378fa296441cabe8bb81b2bc200b5

 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,