# Conflicts: # hly-service/hly-service-all/src/main/java/com/hlbd/provider/all/ClientApplication.java