fix conflict

Helius

2022-02-14 59cf24b0aba393e145f4ba3d58e98b7a01a80992

 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