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

jyy

2021-07-10 1ee0a09016bd72b508456b23dae1afab44cd856b

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