From 99091a8cbb8e098575c75a7c640b568addbcc29d Mon Sep 17 00:00:00 2001 From: wzy <wzy19931122ai@163.com> Date: Sun, 09 Oct 2022 21:41:13 +0800 Subject: [PATCH] Merge branch 'score_shop' --- zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml index 6bafe6f..f93a4cf 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml @@ -679,7 +679,9 @@ b.remark, b.TYPE AS orderType , c.su_name as userName, - d.SHOP_NAME as shopName + d.SHOP_NAME as shopName, + b.SERVICE_ID as serviceId, + b.ORDER_ID as orderId FROM sys_out_store_item a LEFT JOIN sys_out_store b ON a.OUT_STORE_ID = b.id @@ -731,7 +733,9 @@ t2_b.remark, t2_b.instore_type, t2_c.su_name, - t2_d.SHOP_NAME + t2_d.SHOP_NAME, + '' as serviceId, + '' as orderId FROM sys_instore_detail t2_a LEFT JOIN sys_instore_info t2_b ON t2_a.INSTORE_ID = t2_b.id -- Gitblit v1.9.1