改好company_group数据结构,约战功能暂时不要用，没改好
Merge branch 'dev' of https://github.com/avocadocn/mean into dev