# Conflicts:
#	pom.xml
#	src/main/java/com/zjty/adaptationmaster/adaptor/service/Impl/AdaptationServiceImpl.java