Skip to content

O
order-group
Commit 56a15078 by 查志伟
Options

merge 冲突

parent c20c0894
Showing with 2 additions and 2 deletions
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
...@@ -268,8 +268,8 @@ public class OrderServiceImpl implements Orderservice { ...@@ -268,8 +268,8 @@ public class OrderServiceImpl implements Orderservice {
private ActivityApplicationClient activityApplicationClient; private ActivityApplicationClient activityApplicationClient;
@Autowired @Autowired
private AssortmentOpenPlatformWxappAuthorizerManager wxappAuthorizerManager; private AssortmentOpenPlatformWxappAuthorizerManager wxappAuthorizerManager;
// @Autowired @Autowired
// private PaymentNewClient paymentNewClient; private PaymentNewClient paymentNewClient;
// @Autowired // @Autowired
// private MallOrderServiceImpl mallOrderService; // private MallOrderServiceImpl mallOrderService;
@Autowired @Autowired
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment