Merge branch 'master' into div

yujian

2019-07-16 a503900f405a39f3aa30a8663ca661cf3c6b55ea

 fanli/src/main/java/com/yeshi/fanli/controller/admin/PushController.java

@@ -125,7 +125,7 @@
            // 部分推送

            for (String str_uid: listuid) {

               if (str_uid != null && str_uid.trim().length() > 0) {

                  pushService.pushUrl(Long.parseLong(str_uid), url, title, content, listIOS, listAndroid);

                  pushService.pushUrl(Long.parseLong(str_uid), title, content, url, listIOS, listAndroid);

               }

            }

         }