Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
C
CFFP-HB
  • 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
  • Chao Sun
  • CFFP-HB
  • Merge Requests
  • !119

Merged
Opened Jul 03, 2026 by yuzhenWang@yuzhenWang 
  • Report abuse
Report abuse

修改积分明细api方法,已发生产合并代码

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b test origin/test

Step 2. Review the changes locally

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

git checkout wyz
git merge --no-ff test

Step 4. Push the result of the merge to GitLab

git push origin wyz

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 2
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • yuzhenWang @yuzhenWang

    mentioned in commit ad8ab7bb

    Jul 03, 2026

    mentioned in commit ad8ab7bb

    mentioned in commit ad8ab7bb19de1d8fe0efaa860d6b742f3110411a
    Toggle commit list
  • yuzhenWang @yuzhenWang

    merged

    Jul 03, 2026

    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
1
1 participant
Reference: chaosun/CFFP!119
×

Revert this merge request

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.