修改客户信息显示字段
社区预警
more problem
Merge branch 'develop' of https://github.com/liyijie/sh_weather into develop

Conflicts:
	app/admin/api_user.rb