调了几个接口
Merge branch 'wangkun_branch4.0'
=.=