修改崩溃问题
Signed-off-by: li <li@163.com>
Merge branch 'develop' into jia