解决代码合并后报错

bc75ea08 · ping.wu · 0c3d1d20 · bc75ea08
Commit bc75ea08 authored Oct 15, 2021 by ping.wu
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
@@ -262,8 +262,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