Merge branch 'score_shop' into api_score_meger

jyy

2021-05-22 7a8716132ea660525d4790349e05d59b3c369bb6

 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;