paidui
yes: Merge branch 'master' of https://github.com/withitergroup/quhao

Conflicts:
	modules/quhao.appserver/app/japidviews/backend/self/SelfManagementController/index.html
merge