• This project
    • Loading...
  • Sign in

fangyeqing / xkl-interface · Merge Requests

Go to a project

GitLab

  • Go to dashboard
  • Project
  • Activity
  • Files
  • Commits
  • Pipelines 0
  • Builds 0
  • Graphs
  • Milestones
  • Issues 0
  • Merge Requests 0
  • Members
  • Labels
  • Wiki
  • Forks
  • Network
  • Create a new issue
Closed
Merge Request !1 opened 2016-11-12 15:51:25 UTC byzhaoyue@zhaoyue

Zhaoyue dev

  1. 增加报告航船客户端登录、注销、获取最新版本接口代码。
  2. 增加AMP Report表的对应实体文件。
Edited 2017-01-02 13:48:12 UTC
Request to merge zhaoyue-dev 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 zhaoyue-dev origin/zhaoyue-dev

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 zhaoyue-dev

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

Closed by zhaoyue 2016-11-27 15:08:02 UTC

The changes were not merged into master.

  • Discussion 0
  • Commits 9
  • Changes 33
  • zhaoyue
    @zhaoyue 2016-11-12 15:54:26 UTC
    Master

    Added 1 commit:

    • 2611219a - Bug fix
  • zhaoyue
    @zhaoyue 2016-11-12 15:56:41 UTC
    Master

    Added 1 commit:

    • 8a5ab420 - Bug fix
  • zhaoyue
    @zhaoyue 2016-11-13 10:17:31 UTC
    Master

    Added 1 commit:

    • 0f9bbdab - Add report parse
  • zhaoyue
    @zhaoyue 2016-11-27 15:03:02 UTC
    Master

    Added 1 commit:

    • 2c9515d1 - Add report pase, save and delete. Add upsoft version, account.
  • zhaoyue
    @zhaoyue 2016-11-27 15:04:01 UTC
    Master

    Added 1 commit:

    • 7c45f1fa - Add json jar.
  • zhaoyue
    @zhaoyue 2016-11-27 15:08:02 UTC
    Master

    Status changed to closed

  • Please register or login to post a comment
1 of 63
Prev Next
fangyeqing
Assignee
fangyeqing @fyq
Assign to
None
Milestone
None
Assign milestone
2
2 participants
Reference: fyq/xkl-interface!1