Merge branch 'master_develop' into div_develop

yujian

2019-05-13 f6ce3fd74c60cb204372b01bc68467c0ed180da7

 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 {