From ecb361733a4f90ad1672c422577292a18c0fd2bb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 03 一月 2020 09:46:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/ESOrderServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/ESOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/ESOrderServiceImpl.java
index c5d33c6..85db921 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/ESOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/ESOrderServiceImpl.java
@@ -24,7 +24,7 @@
 
 	
 	@Override
-	public List<ESOrder> query(String key, String uid) {
-		return esOrderDao.query(key, uid);
+	public List<ESOrder> query(String key, String uid, List<Integer> listPlatform) {
+		return esOrderDao.query(key, uid, listPlatform);
 	}
 }

--
Gitblit v1.8.0