Merge branch 'score_shop' into api_score_meger

jyy

2021-07-31 78472da3395d1db45b6a76688c72a2c2a372c47a

 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,