Merge branch 'mater-1.6.0' into div

admin

2019-08-13 25b7e040153e96fd7c9f649e9b0de8932e1a2a00

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

               }

            }

         }