# Conflicts:
#	user-service/src/main/java/com/hp/user/service/utils/HttpResult.java

# Conflicts:
#	user-service/src/main/java/com/hp/user/service/UserServiceApplaction.java
#	user-service/src/main/java/com/hp/user/service/config/SwaggerConfig1.java

# Conflicts:
#	user-service/src/main/java/com/hp/user/service/config/SwaggerConfig.java

# Conflicts:
#	user-service/pom.xml
#	user-service/src/main/java/com/hp/user/service/controller/AreaController.java