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

admin

2020-02-29 88e78422b773a1a22b7c8f8b6dabdd293f5321d2

 fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java

@@ -103,7 +103,7 @@
         return;



      // 小于2.0.5版本不增加

      if (!VersionUtil.greaterThan_2_1("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android",

      if (!VersionUtil.greaterThan_2_0_5("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android",

            activeLog.getVersionCode()))

         return;



@@ -142,7 +142,7 @@
         return;



      // 小于2.0.2版本不增加

      if (!VersionUtil.greaterThan_2_1("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android",

      if (!VersionUtil.greaterThan_2_0_5("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android",

            activeLog.getVersionCode()))

         return;