# Conflicts: # pom.xml # src/main/java/cn/quantgroup/xyqb/Bootstrap.java # src/main/resources/META-INF/app.properties # src/test/resources/META-INF/app.properties
