From 58508692587d5d99ae905e8f1e4e4249ffb3b08a Mon Sep 17 00:00:00 2001 From: jyy <935090232@qq.com> Date: Sat, 09 Jan 2021 16:32:25 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/api' into api --- zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml index ebbc391..d2b2a8b 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml @@ -466,6 +466,7 @@ <result property="vipName" column="vipName" /> <result property="timeLength" column="timeLength" /> <result property="status" column="status" /> + <result property="createStaffId" column="createStaffId" /> <collection property="projs" ofType="com.matrix.system.app.vo.ServiceOrderListProjVo"> <result property="projName" column="projName" /> <result property="beautyName" column="beautyName" /> @@ -481,6 +482,7 @@ a.YY_TIME time, a.TOTAL_TIME timeLength, a.state status, + a.create_staff_id createStaffId, d.BED_NAME bed, e.VIP_NAME vipName, b.staff_id staffId, -- Gitblit v1.9.1