Merge branch 'hive2.0' into api

jyy

2021-01-25 dc1a4670261bc852f643d19a83ffc53eeac1b902

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