Merge branch 'api' into score_shop

Helius

2021-03-01 52958bc0ffa53a616828bd6aeb9e59cf12cafbd3

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