Merge remote-tracking branch 'origin/master' into div

yujian

2019-06-24 cb6f69f1207ab6cc9c6006515cb831833cfe0d36

 fanli/src/main/java/com/yeshi/fanli/util/VersionUtil.java

@@ -12,7 +12,7 @@


   public static boolean greaterThan_1_5_50(String platform, String versionCode) {

      if ((("android".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 42))

            || (("ios".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 51)))

            || (("ios".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 52)))

         return true;

      else

         return false;