From 5cb9253ec5ca86587a154226998ccc4eae3a14fd Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 12 Jan 2021 15:38:57 +0800
Subject: [PATCH] Merge branch 'api' into order_reform

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

diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
index 14a1061..c7c1561 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
@@ -481,6 +481,7 @@
     <select id="selectApiOrderListInPage" resultType="com.matrix.system.app.vo.OrderDetailVo">
         select
            a.id orderId,
+           a.VIP_ID vipId,
            a.ORDER_NO orderNo,
            a.ORDER_TIME orderTime,
            a.STATU orderStatus,

--
Gitblit v1.9.1