# Conflicts: # src/test/java/com/kjj/cases/assistant/card/ArticalPersonCard.java # src/test/java/com/kjj/cases/assistant/card/PersonCard.java # src/test/java/com/kjj/config/BasicConfig.java