From e04735fb7d9cf321f262a1d5338adc92d4856bc0 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Thu, 28 Jan 2021 14:33:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hive2.0' into hive2.0

---
 zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderService.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderService.java b/zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderService.java
index 23cfd15..6e0e060 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderService.java
+++ b/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);
 }
\ No newline at end of file

--
Gitblit v1.9.1