Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-20 fa791f7796c1546b1329b52a3de8d753915cb4d5

 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,