# Conflicts:
#	xx-campsite/xx-campsite-server/src/main/resources/mapper/CampsiteShopMapper.xml

# Conflicts:
#	xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/ArticleBiz.java

# Conflicts:
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java

# Conflicts:
#	xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/MsgBiz.java

# Conflicts:
#	.gitignore
#	xx-uccn/xx-uccn-server/src/main/resources/mapper/ArticleMapper.xml