merge 冲突

56a15078 · 查志伟 · c20c0894 · 56a15078
Commit 56a15078 authored Sep 28, 2021 by 查志伟
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+2 -2

No files found.
--- a/order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+++ b/order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
@@ -268,8 +268,8 @@ public class OrderServiceImpl implements Orderservice {
    private ActivityApplicationClient activityApplicationClient;
    @Autowired
    private AssortmentOpenPlatformWxappAuthorizerManager wxappAuthorizerManager;
-//    @Autowired
-//    private PaymentNewClient paymentNewClient;
+    @Autowired
+    private PaymentNewClient paymentNewClient;
    //    @Autowired
 //    private MallOrderServiceImpl mallOrderService;
    @Autowired