Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
XDJK
XDJK
  • 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 0
    • Merge Requests 0
  • 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
  • wechatminiprogram
  • XDJKXDJK
  • Merge Requests
  • !17

Merged
Opened Jun 08, 2021 by liuquan@liuquan 
  • 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.login.v3.2.3.20210605.liuquan origin/feature.login.v3.2.3.20210605.liuquan

Step 2. Review the changes locally

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

git checkout XDJK-master
git merge --no-ff feature.login.v3.2.3.20210605.liuquan

Step 4. Push the result of the merge to GitLab

git push origin XDJK-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 1
  • Changes 4
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • liuquan @liuquan

    已合并

    Jun 08, 2021

    已合并

    已合并
    Toggle commit list
  • liuquan @liuquan

    被提及 commit b49c4963

    Jun 08, 2021

    被提及 commit b49c4963

    被提及 commit b49c4963f7899e567086c61bb499e2db0eb56ff8
    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: WechatMiniProgram/XDJK!17
×

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.