修改配置模块编辑功能
Merge branch 'develop' of github.com:WangTe/huazhixun into develop

Conflicts:
	database/huazhixun.sql