Merge branch 'mater-1.6.0' into div

admin

2019-08-22 d80640689e6949780811f4f8d1c8c972dbd4aa0b

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

@@ -328,6 +328,9 @@
    */

   @Transactional

   public void addPushIOSQueue(MessageInfo info, String url, int type, String versionCodes) throws PushException {

		
      if(Constant.IS_TEST)

         return;



      try {