暂存

.gitignore

@@ -45,3 +45,8 @@ Thumbs.db
 /.idea/artifacts/jyzb3.xml
 /jyzb-mq/jyzb-mq-consumer/target/classes/application.yml
 /jyzb-mq/jyzb-mq-producer/target/classes/application.yml
+/jyzb-biz/src/main/java/com/junmp/jyzb/mapper/InventoryMapper.java.orig
+/jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/InventoryServiceImpl.java.orig
+/jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PubOrgServiceImpl.java.orig
+/jyzb-boot/pom.xml.orig
+/jyzb-mq/jyzb-mq-consumer/src/main/java/com/junmp/jyzb/config/DirectReceiver.java.orig

jyzb-biz/src/main/resources/mapper/CabinetMapper.xml

@@ -5,6 +5,7 @@
 
     </resultMap>
 
+
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     id, cabinet_num, `name`, org_id, `location`, error_state, create_time, update_time,