From 1c04c6a9607b7d4543989c73a1ae91274bbb167c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 15 Mar 2022 18:34:05 +0800
Subject: [PATCH] Merge branch 'developer' into alpha

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/WXShopOrderService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/WXShopOrderService.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/WXShopOrderService.java
index da0f5e4..8430dc5 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/WXShopOrderService.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/WXShopOrderService.java
@@ -23,7 +23,7 @@
      * @return
      * @throws Exception
      */
-    AjaxResult createShopOrder(ShopOrderDto shopOrderDto) throws Exception;
+    ShopOrder createShopOrder(ShopOrderDto shopOrderDto) throws Exception;
 
     /**
      * 订单结算

--
Gitblit v1.9.1