抖店消息处理

ms-biz/src/main/java/com/ms/api/service/impl/OpOrderServiceImpl.java

@@ -141,12 +141,10 @@ public class OpOrderServiceImpl implements OpOrderService {
 
     private final OpOrderRsyncLogMapper opOrderRsyncLogMapper;
 
-<<<<<<< HEAD
+    private final OpSettingMapper opSettingMapper;
+
     private final DdTradeMsgMapper ddTradeMsgMapper;
 
-=======
-    private final OpSettingMapper opSettingMapper;
->>>>>>> 445df7dcd5d9fe8ddafc66a490058f869a99993d
     @Lazy
     @Autowired
     private OpOrderSellerWordsUpdateLogService opOrderSellerWordsUpdateLogService;