From 486e22c57ca8a1e2dc6877b539e2f3add67250f1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:28:00 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/util/VersionUtil.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/VersionUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/VersionUtil.java
index 191764c..863ddaf 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/VersionUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/VersionUtil.java
@@ -81,7 +81,7 @@
public static boolean greaterThan_2_1(String platform, String versionCode) {
if ((("android".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 52))
- || (("ios".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 71)))
+ || (("ios".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 75)))
return true;
else
return false;
--
Gitblit v1.8.0