增加字段
Merge branch 'develop' of https://github.com/lantianlz/zx into develop

Conflicts:
	www/middleware/user_middleware.py