用户信息中添加登录方式查询
Merge branch 'unlogin' into develop

Conflicts:
	src/main/java/com/ruyicai/mgr/util/PropertiesUtil.java
	src/main/resources/META-INF/spring/mgr.properties