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

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/ESOrderService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/ESOrderService.java
index 4305fda..6a03330 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/ESOrderService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/ESOrderService.java
@@ -18,7 +18,7 @@
 	 * @param uid
 	 * @return
 	 */
-	List<ESOrder> query(String key, String uid);
+	List<ESOrder> query(String key, String uid, List<Integer> listPlatform);
 	
 	
 }

--
Gitblit v1.8.0