From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict

---
 zq-erp/src/main/java/com/matrix/component/rabbitmq/DeliverCallbackAdapter.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/component/rabbitmq/DeliverCallbackAdapter.java b/zq-erp/src/main/java/com/matrix/component/rabbitmq/DeliverCallbackAdapter.java
index 887b2b2..d477acc 100644
--- a/zq-erp/src/main/java/com/matrix/component/rabbitmq/DeliverCallbackAdapter.java
+++ b/zq-erp/src/main/java/com/matrix/component/rabbitmq/DeliverCallbackAdapter.java
@@ -1,4 +1,4 @@
-package com.matrix.core.rabbitmq;
+package com.matrix.component.rabbitmq;
 
 import com.matrix.core.exception.GlobleExceptionResolver;
 import com.matrix.core.tools.LogUtil;

--
Gitblit v1.9.1