# Conflicts: # client/pom.xml # client/src/main/java/com/pica/cloud/account/account/client/RegisterClient.java # common/pom.xml
