From fe646416d8d46de7b896ddbf65a3ad0cd30b729b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 七月 2020 16:05:56 +0800
Subject: [PATCH] 大淘客与好单库与主包剥离
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java
index 9603e6e..76c6795 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java
@@ -204,11 +204,11 @@
// 鏌ヨ鍒楄〃
List<CommonOrderVO> list = commonOrderService.listQuery((pageIndex - 1) * pageSize, pageSize, keyType, key,
- state, type, orderState, startTime, endTime, sourceType, listShopId, listGoodsId, minTime, money, payment);
+ state, type, orderState, startTime, endTime, sourceType, listShopId, listGoodsId, minTime, money, payment,acceptData.getSystem());
// 缁熻鎬绘暟
long count = commonOrderService.countQuery(keyType, key, state, type, orderState, startTime, endTime,
- sourceType, listShopId, listGoodsId, minTime, money, payment);
+ sourceType, listShopId, listGoodsId, minTime, money, payment,acceptData.getSystem());
for (CommonOrderVO order : list) {
--
Gitblit v1.8.0