From ee0fc4d9b4412cc1c0365b8ac7dd43b78f98a038 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 13 Apr 2021 19:56:40 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop

---
 zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDao.xml |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDao.xml b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDao.xml
index d2cd718..50e3463 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDao.xml
@@ -756,6 +756,13 @@
 		group by order_status
 	</select>
 
+	<select id="selectShopOrderByOrderNo"  resultType="com.matrix.system.shopXcx.bean.ShopOrder"  >
+		select
+		a.*
+		from shop_order a
+		where a.order_no=#{orderNo}
+	</select>
+
 	<update id="batchUpdateOrderStatus">
 		<foreach collection="list" index="index" item="item" separator=";">
 			update shop_order set order_status=#{item.orderStatus}

--
Gitblit v1.9.1