Merge remote-tracking branch 'origin/master'

# Conflicts:
#	server/admin/target/classes/com/doumee/config/shiro/ShiroConfig.class
#	server/admin/target/classes/com/doumee/timer/ZbomIAMSyncJobBiz.class
#	server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
#	server/service/target/classes/com/doumee/biz/system/SystemDictDataBiz.class
#	server/service/target/classes/com/doumee/biz/system/impl/SystemDictDataBizImpl.class
#	server/service/target/classes/com/doumee/core/utils/Constants$RedisKeys.class
#	server/service/target/classes/com/doumee/core/utils/Constants$Status.class
#	server/service/target/classes/com/doumee/core/utils/Constants$VehiclePlateNoEnum.class
#	server/service/target/classes/com/doumee/core/utils/Constants.class
#	server/service/target/classes/com/doumee/core/utils/QrCodeUtils.class
#	server/service/target/classes/com/doumee/core/utils/tyyun/TyyZosUtil.class
#	server/service/target/classes/com/doumee/dao/business/model/IamInterfaceLog.class
#	server/service/target/classes/com/doumee/dao/business/model/Multifile.class
#	server/service/target/classes/com/doumee/dao/business/model/News.class
#	server/service/target/classes/com/doumee/dao/business/model/Shop.class
#	server/service/target/classes/com/doumee/dao/business/model/Users.class
#	server/service/target/classes/com/doumee/service/business/InitService.class
#	server/service/target/classes/com/doumee/service/business/impl/IamInterfaceLogServiceImpl.class
#	server/service/target/classes/com/doumee/service/business/impl/NewsServiceImpl.class
#	server/service/target/classes/com/doumee/service/business/impl/ShopServiceImpl.class
#	server/service/target/classes/com/doumee/service/business/impl/UsersServiceImpl.class
#	server/service/target/classes/mappers/SystemDictDataMapper.xml