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

jyy

2021-07-20 b8d9a7cd20dfbaa3c0cc08f3c27e4addd8774e95

 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);
}