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

jyy

2021-03-12 a5150265e33e493efd96f8c43f3c46088fe92b55

 zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderService.java

@@ -142,5 +142,4 @@

   List<RankingVo> findApiShopAchieveRanking(SysOrder sysOrder);

   List<RankingVo> findStaffSaleAchieveRanking(SysOrder sysOrder);
}