Merge tag '1.0.4' into develop
authorXia Kaixiang <kaixiang.xia@supwisdom.com>
Wed, 30 Oct 2019 09:42:46 +0000 (17:42 +0800)
committerXia Kaixiang <kaixiang.xia@supwisdom.com>
Wed, 30 Oct 2019 09:42:46 +0000 (17:42 +0800)
大理现场修改


Trivial merge