Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
F
factory_front
  • 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
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • qinjianhui
  • factory_front
  • Merge Requests
  • !285

Closed
Opened Jul 30, 2026 by wusiyi@wusiyi 
  • Report abuse
Report abuse

Dev sorting rule

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b dev_sorting_rule origin/dev_sorting_rule

Step 2. Review the changes locally

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

git checkout dev
git merge --no-ff dev_sorting_rule

Step 4. Push the result of the merge to GitLab

git push origin dev

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 30
  • Changes 23
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • wusiyi @wusiyi

    added 36 commits

    • 789cfb55...1466df3b - 22 commits from branch dev
    • f2eff035 - feat: 配货分拣规则支持商品类目条件 #1010170
    • 8ad7dc9f - chore: 升级 element-plus 至2.14版本
    • 7436780b - feat: 展示商品类目 #1010170
    • f48efd31 - feat: 展示商品类目 #1010170
    • 54ce2ac9 - fix: bug
    • 73313386 - chore: 升级 element-plus 至2.14版本
    • 8fc34b81 - feat: 展示商品类目 #1010170
    • 1325871a - feat: 展示商品类目 #1010170
    • 24979309 - feat: 配货分拣样式调整
    • ab2f1dda - fix: 样式调整
    • 4a0f9012 - fix: 待接单查询分页数据接口返回结果为空bug修复 #1001896
    • dcee8831 - fix: 待接单查询分页数据接口返回结果为空bug修复 #1001896
    • 7f1261a3 - fix: elementPlus样式适配
    • 0a8d4cec - Merge branch 'dev_sorting_rule' of…

    Compare with previous version

    Jul 30, 2026

    added 36 commits

    • 789cfb55...1466df3b - 22 commits from branch dev
    • f2eff035 - feat: 配货分拣规则支持商品类目条件 #1010170
    • 8ad7dc9f - chore: 升级 element-plus 至2.14版本
    • 7436780b - feat: 展示商品类目 #1010170
    • f48efd31 - feat: 展示商品类目 #1010170
    • 54ce2ac9 - fix: bug
    • 73313386 - chore: 升级 element-plus 至2.14版本
    • 8fc34b81 - feat: 展示商品类目 #1010170
    • 1325871a - feat: 展示商品类目 #1010170
    • 24979309 - feat: 配货分拣样式调整
    • ab2f1dda - fix: 样式调整
    • 4a0f9012 - fix: 待接单查询分页数据接口返回结果为空bug修复 #1001896
    • dcee8831 - fix: 待接单查询分页数据接口返回结果为空bug修复 #1001896
    • 7f1261a3 - fix: elementPlus样式适配
    • 0a8d4cec - Merge branch 'dev_sorting_rule' of…

    Compare with previous version

    added 36 commits * 789cfb55...1466df3b - 22 commits from branch `dev` * f2eff035 - feat: 配货分拣规则支持商品类目条件 #1010170 * 8ad7dc9f - chore: 升级 element-plus 至2.14版本 * 7436780b - feat: 展示商品类目 #1010170 * f48efd31 - feat: 展示商品类目 #1010170 * 54ce2ac9 - fix: bug * 73313386 - chore: 升级 element-plus 至2.14版本 * 8fc34b81 - feat: 展示商品类目 #1010170 * 1325871a - feat: 展示商品类目 #1010170 * 24979309 - feat: 配货分拣样式调整 * ab2f1dda - fix: 样式调整 * 4a0f9012 - fix: 待接单查询分页数据接口返回结果为空bug修复 #1001896 * dcee8831 - fix: 待接单查询分页数据接口返回结果为空bug修复 #1001896 * 7f1261a3 - fix: elementPlus样式适配 * 0a8d4cec - Merge branch 'dev_sorting_rule' of… [Compare with previous version](http://47.122.114.111:9999/qinjianhui/factory_front/merge_requests/285/diffs?diff_id=9861&start_sha=789cfb55aa4a7a6284dffc90634b4c26d254bda7)
    Toggle commit list
  • wusiyi @wusiyi

    closed

    Jul 30, 2026

    closed

    closed
    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
1
1 participant
Reference: qinjianhui/factory_front!285