1 删除多余文件夹
2 修改JS的头
Merge remote-tracking branch 'origin/dev' into dev