Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
H
haoban-manage3.0
  • 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
  • haoban3.0
  • haoban-manage3.0
  • Merge Requests
  • !2916

Merged
Opened Jun 03, 2025 by 王祖波@wangzubo 
  • Report abuse
Report abuse

过滤全是赠品订单

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b feature-recommend3 origin/feature-recommend3

Step 2. Review the changes locally

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

git checkout developer
git merge --no-ff feature-recommend3

Step 4. Push the result of the merge to GitLab

git push origin developer

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 1
  • Changes 1
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • 王祖波 @wangzubo

    mentioned in commit f9166373

    Jun 03, 2025

    mentioned in commit f9166373

    mentioned in commit f916637384d2dfa9e1c69ec36a5cc6a1d4759cf3
    Toggle commit list
  • 王祖波 @wangzubo

    merged

    Jun 03, 2025

    merged

    merged
    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: haoban3.0/haoban-manage3.0!2916
×

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.