From 325009946e7c987c4b087509ffef5087f8b3d09a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 14 一月 2019 11:19:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoOrderService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoOrderService.java
index 14048dc..773508a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoOrderService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoOrderService.java
@@ -87,9 +87,9 @@
 	 * @return
 	 * @throws Exception
 	 */
-	public List<TaoBaoOrderVO> listQuery(int start, int count, Integer keyType, String key, String startTime, String endTime,
+	public List<TaoBaoOrderVO> listQuery(int start, int count, String key, String startTime, String endTime,
 			Integer state) throws Exception;
 
-	public long countQuery(Integer keyType, String key, String startTime, String endTime, Integer state) throws Exception;
+	public long countQuery(String key, String startTime, String endTime, Integer state) throws Exception;
 
 }

--
Gitblit v1.8.0