Signed-off-by: 5dprince <5dprince@163.com>
Merge branch 'develop' of git@github.com:zxpbenson/shopxx.git into develop

Conflicts:
	src/jdbc.properties
	src/net/shopxx/common/AdminSecurityDefinitionSource.java
	src/net/shopxx/common/MyAuthenticatedVoter.java
	src/net/shopxx/common/MyRoleVoter.java
	src/net/shopxx/service/RoleService.java
	src/net/shopxx/service/impl/RoleServiceImpl.java