Merge branch 'score_shop' into api_score_meger

jyy

2021-04-20 0649fb5e05730a8f8bf15b0fe019a7227361f1af

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