添加图表
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/base/base.html
	client/util/js/common.js
	client/util/js/util.js
完善修改菜单功能