From: Chengcheng Zhang <943420582@qq.com>
Date: Tue, 25 Jun 2019 11:45:02 +0000 (+0800)
Subject: Merge branch 'master' into wallet-store-interface
X-Git-Url: http://git.osdn.net/view?p=bytom%2Fvapor.git;a=commitdiff_plain;h=f9a7bbabc598ce93489b9fcfbbf051033e8cf6d6

Merge branch 'master' into wallet-store-interface
---

f9a7bbabc598ce93489b9fcfbbf051033e8cf6d6