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

zj

2024-09-04 6404cb07e5281cfd901267c4fd560ba89bd5e2fd

 src/main/java/com/nq/controller/UserApiController.java

@@ -17,6 +17,7 @@

import com.nq.utils.redis.RedisShardedPoolUtils;

import com.nq.utils.translate.GoogleTranslateUtil;
import com.nq.vo.user.UserLoginResultVO;

import javax.servlet.http.HttpServletRequest;
@@ -75,7 +76,7 @@
            UserLoginResultVO resultVO = new UserLoginResultVO();
            resultVO.setKey(pc_cookie_name);
            resultVO.setToken(token);
            return ServerResponse.createBySuccess("登录成功", resultVO);
            return ServerResponse.createBySuccess(resultVO );
        }
        return serverResponse;
    }