From e4ac82fd428335020eb6522fc642b4fd91eb86f0 Mon Sep 17 00:00:00 2001 From: houruijun <411269194@kidgrow.com> Date: Thu, 20 Aug 2020 16:27:04 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml index 6cefc57..a2c36bd 100644 --- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml +++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml @@ -176,6 +176,7 @@ </select> <select id="hospitalDoctorListAndDel" parameterType="long" resultType="com.kidgrow.usercenter.vo.HospitalDoctorListVo"> SELECT + distinct dc.create_time, dc.department_name, dc.hospital_name, @@ -190,7 +191,7 @@ us.username, us.default_auth, us.enabled, - roleuser.role_id, +-- roleuser.role_id, dc.is_del FROM sys_doctor dc -- Gitblit v1.8.0