解决冲突

server/src/main/java/com/pica/cloud/account/account/server/service/impl/LoginServiceImpl.java

@@ -290,7 +290,6 @@ public class LoginServiceImpl implements LoginService {
         //记录登录日志
         LogLoginEntity entity = AccountLogEntityUtils.getLogLoginEntity(acctId, baseRequest.getProductType(), baseRequest.getSourceType(),
                 loginType, baseRequest.getLoginIp(), AccountTypeEnum.LOGIN_STATUS_SUCCESS.getCode(), AccountTypeEnum.LOG_TYPE_LOGIN.getCode(),newToken);
-                loginType, baseRequest.getLoginIp(), AccountTypeEnum.LOGIN_STATUS_SUCCESS.getCode(), AccountTypeEnum.LOG_TYPE_LOGIN.getCode());
         if (queryMobileEntity != null) {
             entity.setQueryMobileEntity(queryMobileEntity);
         }
@@ -659,7 +658,7 @@ public class LoginServiceImpl implements LoginService {
                     AccountTypeEnum.LOGIN_APPLE.getCode(),
                     request.getLoginIp(),
                     AccountTypeEnum.LOGIN_STATUS_SUCCESS.getCode(),
-                    AccountTypeEnum.LOG_TYPE_LOGIN.getCode());
+                    AccountTypeEnum.LOG_TYPE_LOGIN.getCode(),newToken);
             picaLogUtils.info(entity);
 
             long end1 = System.currentTimeMillis();