From 34dba42b4d215398ed3215efb3c31a898870ffcf Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 12 Jan 2021 16:20:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api' into api
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml | 2 ++
1 files changed, 2 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 ac14a03..33c70be 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
@@ -479,6 +479,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,
@@ -580,6 +581,7 @@
<select id="selectStaffSaleAchieveRanking" resultType="com.matrix.system.app.vo.RankingVo">
select
b.su_name name,
+ b.su_id id,
b.su_photo photo,
sum(ZK_TOTAL) amount,
c.shop_short_name shopName
--
Gitblit v1.9.1