From: Yongfeng LI <wliyongfeng@gmail.com>
Date: Tue, 10 Apr 2018 05:56:31 +0000 (+0800)
Subject: Merge pull request #569 from Bytom/dev
X-Git-Tag: v1.0.5~11^2^2~16
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=refs%2Ftags%2Fv0.4.4;p=bytom%2Fbytom.git

Merge pull request #569 from Bytom/dev

Dev
---

8a6b761eb889f59afd2ea395d64de14f094109e6