Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushInfoServiceImpl.java

@@ -357,7 +357,7 @@
               case 1: // 站内信

                  pushService.pushZNX(uid, title, content, listIOS, listAndroid);

                  userSystemMsgService.addUserSystemMsg(uid, UserSystemMsgTypeEnum.question, title, content,

                        UserSystemMsg.TIME_TAG_EMERGENT, null);

                        UserSystemMsg.TIME_TAG_COMMON, null);

                  break;

               case 2: // 网页推送

                  pushService.pushUrl(uid, title, content, url, listIOS, listAndroid);