Merge branch 'hotfix/1.0.19' 1.0.20
authorqiaowei <jov123@163.com>
Fri, 17 Jul 2020 07:21:27 +0000 (15:21 +0800)
committerqiaowei <jov123@163.com>
Fri, 17 Jul 2020 07:21:27 +0000 (15:21 +0800)

Trivial merge