From 37e8ba46879a6094938ad685b1054eb6446ae749 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 五月 2020 19:13:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java
index 8f7cb69..6e634af 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java
@@ -426,10 +426,10 @@
 	 */
 	public List<CommonOrderVO> getOrderList(AcceptData acceptData, Integer page, Long uid, Integer state, Integer type,
 			Integer orderState, String orderNo, String startTime, String endTime, Integer dateType,
-			List<Integer> listSource) throws CommonOrderException, Exception;
+			List<Integer> listSource, boolean notBackSuVip) throws CommonOrderException, Exception;
 
 	long countOrderList(Long uid, Integer state, Integer type, Integer orderState, String orderNo, String startTime,
-			String endTime, Integer dateType, List<Integer> listSource) throws CommonOrderException;
+			String endTime, Integer dateType, List<Integer> listSource, boolean notBackSuVip) throws CommonOrderException;
 
 	/**
 	 * 缁存潈閲戦璁＄畻

--
Gitblit v1.8.0