merge:合并master

yt-ios-lemon/lemon-ios-service/src/main/java/com/ytpm/lemonios/controller/WxController.java

@@ -159,7 +159,7 @@ public class WxController {
             redisService.del(redisKey);
         }
         IosUserInfo userInfo = setIosUserInfo(param);
-        param.setLoginIp(getClientIp(request));
+        param.setLoginIp(HttpClientUtil.getClientIp(request));
         YtDyzUser old = appUserService.crudForNewTransIos(param, userInfo, LoginType.IOS.getTypeName());
         //调用风控服务校验默认风控配置
         old.setRiskCode("313");