Repository navigation
pull request - #163
Merged
Merged
pull request#163
Conversation
fuqiangdong01
commented
Mar 21, 2017
- 新增两个硬件平台接口实现
- 申请设备二维码接口的返回格式有变动,做出相应更改
- 优化命名格式
Develop Synchroniz
Owner
|
@JohnnyTung 可能我们提交代码时间比较接近,所以导致你把我的有问题的一部分代码也给合并过去了,你现在重新合并下再试试吧,我这边目前无法进行merge操作。 |
Owner
|
可以了,不好意思,我刚才看错了 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.