Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2020-01-03 0a63d22e38a644bc83b393ed85618b04d3be858b

 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;