Skip to content

pull request - #163

Merged
binarywang merged 7 commits into
binarywang:developfrom
fuqiangdong01:develop
Mar 21, 2017
Merged

binarywang merged 7 commits into
binarywang:developfrom
fuqiangdong01:develop

Conversation

@fuqiangdong01

Copy link
Copy Markdown
  1. 新增两个硬件平台接口实现
  2. 申请设备二维码接口的返回格式有变动,做出相应更改
  3. 优化命名格式

@binarywang

Copy link
Copy Markdown
Owner

@JohnnyTung 可能我们提交代码时间比较接近,所以导致你把我的有问题的一部分代码也给合并过去了,你现在重新合并下再试试吧,我这边目前无法进行merge操作。

@binarywang
binarywang merged commit 6847a41 into binarywang:develop Mar 21, 2017
@binarywang

Copy link
Copy Markdown
Owner

可以了,不好意思,我刚才看错了

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants