From e301f996adb2cc8442369c6c3577ef38680b4a18 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 14 Jan 2026 17:46:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/czg/task/EntryManagerTask.java            | 2 +-
 .../java/com/czg/service/order/service/impl/PayServiceImpl.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cash-api/order-server/src/main/java/com/czg/task/EntryManagerTask.java b/cash-api/order-server/src/main/java/com/czg/task/EntryManagerTask.java
index 5996b7b89..2335f2d5f 100644
--- a/cash-api/order-server/src/main/java/com/czg/task/EntryManagerTask.java
+++ b/cash-api/order-server/src/main/java/com/czg/task/EntryManagerTask.java
@@ -30,7 +30,7 @@ import java.util.List;
 public class EntryManagerTask {
     @Resource
     private ShopDirectMerchantService shopDirectMerchantService;
-    @DubboReference
+    @Resource
     private ShopMerchantService shopMerchantService;
 
     //每10分钟查一次
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
index e4df84c39..ef1cfff72 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
@@ -44,7 +44,7 @@ import java.util.Map;
 @Service
 public class PayServiceImpl implements PayService {
 
-    @DubboReference
+    @Resource
     private ShopMerchantService shopMerchantService;
     @DubboReference
     private SysParamsService sysParamsService;