简要修改
配置更改
merged
暂时禁用spring security
修改js目录结构
Merge branch 'master' of https://github.com/commovclub/commov

Conflicts:
Merge branch 'master' of https://github.com/commovclub/commov

Conflicts: