# Conflicts:
#	.gitignore
#	jyzb-biz/src/main/java/com/junmp/jyzb/entity/Inventory.java
#	jyzb-boot/pom.xml
#	jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	jyzb-mq/jyzb-mq-producer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst