Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-03-16 67e2e142e752b724e021f3562c7f28e128e6f118

 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;