# Conflicts:
#	CODE/smart-community/app-api/src/main/java/com/community/huiju/common/hk/HKOpenApi.java

# Conflicts:
#	CODE/smart-community/app-api/src/main/java/com/community/huiju/common/hk/HKConstant.java
#	CODE/smart-community/app-api/src/main/java/com/community/huiju/common/hk/HKOpenApi.java

# Conflicts:
#	CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/MessageController.java
#	CODE/smart-community/community-common/target/classes/com/community/commom/ailiyun/AESDecode.class
#	CODE/smart-community/community-common/target/classes/com/community/commom/mode/ResponseBean.class
#	CODE/smart-community/community-common/target/classes/com/community/commom/redis/FastJsonSerializer.class
#	CODE/smart-community/community-common/target/classes/com/community/commom/redis/RedisConfiguration.class
#	CODE/smart-community/community-common/target/classes/com/community/commom/redis/RedisJsonSerializer.class
#	CODE/smart-community/community-common/target/classes/com/community/commom/redis/RedisObjectSerializer.class
#	CODE/smart-community/community-common/target/classes/com/community/commom/redis/RedisSerializer.class
#	CODE/smart-community/community-common/target/classes/com/community/commom/redis/RedisTemplate.class
#	CODE/smart-community/community-common/target/classes/com/community/commom/redis/SerializationFailedException.class
#	CODE/smart-community/community-common/target/classes/com/community/commom/redis/SingleRedisTemplate.class
#	CODE/smart-community/community-common/target/classes/com/community/commom/session/UserElement.class
#	CODE/smart-community/community-common/target/classes/com/community/commom/utils/AccountValidatorUtil.class
#	CODE/smart-community/community-common/target/classes/com/community/commom/utils/BeanTools.class
#	CODE/smart-community/community-common/target/classes/com/community/commom/utils/CommonUtils.class
#	CODE/smart-community/community-common/target/classes/com/community/commom/utils/CookieUtil.class
#	CODE/smart-community/community-common/target/classes/com/community/commom/utils/DESUtils.class
#	CODE/smart-community/community-common/target/classes/com/community/commom/utils/DateUtils.class
#	CODE/smart-community/community-common/target/classes/com/community/commom/utils/EnumUtils.class
#	CODE/smart-community/community-common/target/classes/com/community/commom/utils/HttpClientUtils.class
#	CODE/smart-community/community-common/target/classes/com/community/commom/utils/MD5Utils.class
#	CODE/smart-community/community-common/target/classes/com/community/commom/utils/OssUtil.class
#	CODE/smart-community/community-common/target/classes/com/community/commom/utils/QRCodeGeneratorUtils.class
#	CODE/smart-community/community-common/target/classes/com/community/commom/utils/StringConverter.class