• This project
    • Loading...
  • Sign in

fe / yoho-shop-manage · Merge Requests

Go to a project

GitLab

  • Go to group
  • Project
  • Activity
  • Files
  • Commits
  • Pipelines 0
  • Builds 0
  • Graphs
  • Milestones
  • Issues 0
  • Merge Requests 0
  • Members
  • Labels
  • Wiki
  • Forks
  • Network
  • Create a new issue
Merged
Merge Request !101 opened 2019-03-26 05:53:15 UTC by邱骏@qiuj

增加进销存报表,商品看板增加字段

Edited 2019-04-22 07:05:14 UTC
Request to merge feature/business-board-add-field into master
×

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/business-board-add-field origin/feature/business-board-add-field

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 feature/business-board-add-field

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

Merged by 陈峰 2019-04-22 07:05:14 UTC

The changes were merged into master.

  • Discussion 0
  • Commits 11
  • Changes 16
  • 邱骏
    @qiuj 2019-03-26 05:56:37 UTC
    Developer

    Added 1 commit:

    • 22631448 - 增加进销存报表,商品看板增加字段
  • 邱骏
    @qiuj 2019-03-26 06:01:56 UTC
    Developer

    Added 1 commit:

    • a2a5f859 - 增加进销存报表,商品看板增加字段
  • 邱骏
    @qiuj 2019-03-27 08:07:35 UTC
    Developer

    Added 1 commit:

    • b74102ac - 修复部分问题
  • 邱骏
    @qiuj 2019-03-29 05:54:06 UTC
    Developer

    Added 1 commit:

    • 31528f4c - 修改一些错误
  • 陈峰
    @chenfeng163 2019-04-22 03:22:19 UTC

    Added 2 commits:

    • d71dd642 - docker
    • 24c666aa - Merge branch 'feture/docker' into 'feature/business-board-add-field'
  • 陈峰
    @chenfeng163 2019-04-22 03:27:17 UTC

    Added 2 commits:

    • 1f034de8 - 1.0.39
    • 140d349e - Merge branch 'feture/docker' into 'feature/business-board-add-field'
  • 陈峰
    @chenfeng163 2019-04-22 06:04:22 UTC

    Added 1 commit:

    • 067a94f8 - commit
  • 陈峰
    @chenfeng163 2019-04-22 06:04:52 UTC

    Added 1 commit:

    • 49f44096 - 1.0.40
  • 陈峰
    @chenfeng163 2019-04-22 07:05:13 UTC

    mentioned in commit dc5a5aba

  • 陈峰
    @chenfeng163 2019-04-22 07:05:14 UTC

    Status changed to merged

  • Please register or login to post a comment
101 of 119
Prev Next
陈峰
Assignee
陈峰 @chenfeng163
Assign to
None
Milestone
None
Assign milestone
0
0 participants
Reference: fe/yoho-shop-manage!101
×

Revert this merge request

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

Cherry-pick this merge request

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