From 1a6bfc97c0acfbb386f4e06f6d0a4558c305d994 Mon Sep 17 00:00:00 2001 From: wzy <wzy19931122ai@163.com> Date: Wed, 13 Jan 2021 20:40:40 +0800 Subject: [PATCH] Merge branch 'api' into order_reform --- zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml | 4 ++++ 1 files changed, 4 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..736e68d 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml @@ -464,8 +464,10 @@ <result property="time" column="time"/> <result property="bed" column="bed" /> <result property="vipName" column="vipName" /> + <result property="vipId" column="vipId" /> <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,8 +483,10 @@ a.YY_TIME time, a.TOTAL_TIME timeLength, a.state status, + a.create_staff_id createStaffId, d.BED_NAME bed, e.VIP_NAME vipName, + e.id vipId, b.staff_id staffId, f.su_name beautyName, g.proj_name projName -- Gitblit v1.9.1