Merge remote-tracking branch 'origin/master'

admin

2019-04-12 2406574c36a8c4e8e8ffe7c56a34e25dde107a84

 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();