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/system/shopXcx/action/ShopRefundRecordAction.java |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopRefundRecordAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopRefundRecordAction.java
index e8a8b67..b17b449 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopRefundRecordAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopRefundRecordAction.java
@@ -1,8 +1,6 @@
 package com.matrix.system.shopXcx.action;
 
 import com.matrix.component.asyncmessage.AsyncMessageManager;
-import com.matrix.component.rabbitmq.RabiitMqTemplate;
-import com.matrix.component.redis.RedisUserLoginUtils;
 import com.matrix.component.wechat.externalInterface.weixinUtil.WeixinServiceUtil;
 import com.matrix.core.anotations.RemoveRequestToken;
 import com.matrix.core.anotations.SaveRequestToken;
@@ -63,8 +61,6 @@
 	private WXShopOrderService wxShopOrderService;
 	@Autowired
 	private ShopDeliveryInfoDao shopDeliveryInfoDao;
-	@Autowired
-	private RedisUserLoginUtils redisUserLoginUtils;
 	@Autowired
 	private AsyncMessageManager asyncMessageManager;
 	@Autowired

--
Gitblit v1.9.1