From 4d4805096b898a6e99f31794facb81794bd1fcf7 Mon Sep 17 00:00:00 2001 From: jyy <935090232@qq.com> Date: Mon, 25 Jan 2021 09:39:24 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/hive2.0' into hive2.0 --- zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseFlowDao.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseFlowDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseFlowDao.xml index a767566..a40157c 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseFlowDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseFlowDao.xml @@ -160,7 +160,7 @@ times, gift_money, balance, - (SELECT STAFF_NAME from sys_shopstaff_info a WHERE operation_id=a.id) staffName, + (SELECT su_name from sys_users a WHERE operation_id=a.su_id) staffName, (SELECT VIP_NAME FROM sys_vip_info b WHERE vip_id=b.ID) vipName, (SELECT card_NAME FROM money_card_use c WHERE car_use_id=c.ID) cardName from money_card_use_flow -- Gitblit v1.9.1