From 64bd2204be459b47e008b79073a143684140ff24 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 04 七月 2020 18:20:45 +0800
Subject: [PATCH] mapper xml文件位置移动

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/PushController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/PushController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/PushController.java
index 2cdc12e..afe7362 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/PushController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/PushController.java
@@ -229,10 +229,10 @@
 
 		// 璁惧娉ㄥ唽鏃堕棿
 		Date createTime = deviceActive.getCreateTime();
-		count = pushGoodsService.countHistoryByPushTime(uid, createTime);
+		count = pushGoodsService.countHistoryByPushTime(uid, createTime,acceptData.getSystem());
 
 		int pageSize = Constant.PAGE_SIZE;
-		List<PushGoods> list = pushGoodsService.listHistoryByPushTime((page - 1) * pageSize, pageSize, uid, createTime);
+		List<PushGoods> list = pushGoodsService.listHistoryByPushTime((page - 1) * pageSize, pageSize, uid, createTime,acceptData.getSystem());
 		if (list == null)
 			list = new ArrayList<>();
 

--
Gitblit v1.8.0