commit by edit_adapter
Merge branch 'master' of https://git.duapp.com/appid1147gdf48e
报错，先注释掉