# Conflicts:
#	jyzb-biz/src/main/java/com/junmp/jyzb/mapper/InventoryMapper.java
#	jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/InventoryServiceImpl.java
#	jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PubOrgServiceImpl.java
#	jyzb-boot/pom.xml
#	jyzb-mq/jyzb-mq-consumer/src/main/java/com/junmp/jyzb/config/DirectReceiver.java
#	jyzb-mq/jyzb-mq-consumer/target/classes/application.yml
#	jyzb-mq/jyzb-mq-consumer/target/maven-archiver/pom.properties
#	jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	jyzb-mq/jyzb-mq-producer/target/classes/application.yml
#	jyzb-mq/jyzb-mq-producer/target/maven-archiver/pom.properties
#	jyzb-mq/jyzb-mq-producer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst