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

935090232@qq.com

2021-01-06 6a2d3e41099a782770f2aa0f648061ac0bd2d4ce

 zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml

@@ -580,6 +580,7 @@
    <select id="selectStaffSaleAchieveRanking" resultType="com.matrix.system.app.vo.RankingVo">
        select
               b.su_name name,
               b.su_id id,
               b.su_photo photo,
               sum(ZK_TOTAL) amount,
               c.shop_short_name shopName