Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
X
xyw_asset_console
  • Overview
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 1
    • Merge Requests 1
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • DaiJiezhang
  • xyw_asset_console
  • Merge Requests
  • !5

Merged
Opened Aug 04, 2026 by DaiJiezhang@Jeddy 
  • Report abuse
Report abuse

feat: 合并认证权限与原生登录密码框修复

内容

  • 合并账号权限与本地 CORS 兼容修复
  • 恢复浏览器原生密码自动填充与 Element Plus 眼睛图标
  • 保证密码框与账号框同宽

验证

  • 后端 Maven 测试:45/45 通过
  • 前端登录测试:12/12 通过
  • 前端生产构建成功

风险

  • 当前与 master 合并预演无文本冲突
  • 合并前若 master 更新,请重新检查 CI 与冲突
×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b codex/master-auth-login-fixes origin/codex/master-auth-login-fixes

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout master
git merge --no-ff codex/master-auth-login-fixes

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 0
  • Commits 2
  • Changes 8
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • DaiJiezhang @Jeddy

    merged

    Aug 04, 2026

    merged

    merged
    Toggle commit list
  • DaiJiezhang @Jeddy

    mentioned in commit 7e722efd

    Aug 04, 2026

    mentioned in commit 7e722efd

    mentioned in commit 7e722efded1ccb92bc3e8681f14232f5bfa411f5
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: Jeddy/xyw_asset_console!5
×

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.