merge from mingan

Conflicts:
	src/main/java/com/tgtjx/manage/service/user/UserService.java
	src/main/resources/application.properties
	src/main/resources/sql/postgresql/schema.sql
	src/main/webapp/static/modules/UserManage.js
	src/main/webapp/static/templates/userManage.html