# Conflicts:
#	pom.xml
#	src/main/java/cn/quantgroup/xyqb/Bootstrap.java
#	src/main/resources/META-INF/app.properties
#	src/test/java/demo/MockMvcTests.java
#	src/test/java/demo/MvcTests.java
#	src/test/java/demo/ParametersJunit5Tests.java
#	src/test/java/demo/RepsitoryJpaTests.java
#	src/test/java/demo/RepsitoryTests.java
#	src/test/java/demo/ServiceTests.java
#	src/test/java/demo/WebTests.java
#	src/test/resources/META-INF/app.properties