From 2406574c36a8c4e8e8ffe7c56a34e25dde107a84 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期五, 12 四月 2019 17:08:38 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java index fc9876c..ec28afe 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java @@ -601,7 +601,7 @@ List<UserMsgCenter> listCenter = new ArrayList<>(); - List<Special> listSpecial = specialService.listBySystemAndCard("msg_activities", system.getId()); + List<Special> listSpecial = specialService.listByPlaceKey("msg_activities"); if (listSpecial != null && listSpecial.size() > 0) { for (Special special: listSpecial) { UserMsgCenter msgCenter = new UserMsgCenter(); -- Gitblit v1.8.0