Merge branch 'hotfix/1.0.18' 1.0.18
authorTang Cheng <cheng.tang@supwisdom.com>
Wed, 15 Jul 2020 07:18:10 +0000 (15:18 +0800)
committerTang Cheng <cheng.tang@supwisdom.com>
Wed, 15 Jul 2020 07:18:10 +0000 (15:18 +0800)

Trivial merge