Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/BaseMonitor

 Conflicts:

	base-common/src/main/java/com/ozs/common/core/domain/entity/SysUser.java

	base-framework/src/main/java/com/ozs/framework/web/service/SysLoginService.java

	base-framework/src/main/java/com/ozs/framework/web/service/UserDetailsServiceImpl.java

	base-system/src/main/java/com/ozs/system/service/impl/SysUserServiceImpl.java

	base-system/src/main/resources/mapper/system/SysUserMapper.xml