From 0a63d22e38a644bc83b393ed85618b04d3be858b Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 03 一月 2020 12:22:30 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server 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