From b5960ac13f8d67c0baf8f23ffb2e24de1494cbf7 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Mar 2022 15:27:25 +0800
Subject: [PATCH] Merge branch 'developer' into alpha

---
 zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDao.xml |    2 +-
 1 files changed, 1 insertions(+), 1 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 50e3463..ba616cb 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDao.xml
@@ -548,7 +548,7 @@
 	</select>
 
 	<!-- 分页查询 -->
-	<select id="selectInPageByQuery" resultMap="ShopOrderMap">
+	<select id="selectInPageByQuery" resultMap="ShopOrderComplexMap">
 		select
 		o.*,
 		s.shop_name

--
Gitblit v1.9.1