Merge branch 'package' of GameCenter/game-center into dev

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentAppCallbackServiceImpl.java

@@ -83,10 +83,10 @@ implements IGameTencentAppCallbackService {
             if(StringUtils.isNoneBlank(idfa)) {
                 and.or().eq(GameTencentAppCallback::getMuid, Md5Util.encrypt32(idfa.toUpperCase()).toLowerCase());
             }
-            and.or().and(StringUtils.isNoneBlank(ip), tmp -> {
-                        tmp.ge(GameTencentAppCallback::getClickTime, DateUtil.localDateTimeToSecond(regTime.plusDays(2)))
-                                .eq(GameTencentAppCallback::getIp, ip);
-                    });
+            and.or(StringUtils.isNoneBlank(ip), tmp -> {
+                tmp.ge(GameTencentAppCallback::getClickTime, DateUtil.localDateTimeToSecond(regTime.plusDays(2)))
+                        .eq(GameTencentAppCallback::getIp, ip);
+            });
         });
         return getOne(qw);
     }