From 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Mon, 01 Mar 2021 14:14:35 +0800
Subject: [PATCH] Merge branch 'dev1.1' into dev

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml |    4 +++-
 1 files changed, 3 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 f565c82..1333df5 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
@@ -145,7 +145,9 @@
 		sysdep.sale_user_tel,
 		sysdep.enabled depenabled,
 		sysdep.accounts_count,
-		sysdep.is_del depdel
+		sysdep.is_del depdel,
+		sysdep.is_screen depScreen,
+		sysdep.is_new_screenclient depNewScreenclient,
 		FROM sys_user sysuser
 		left JOIN sys_doctor sysdoctor on sysuser.id=sysdoctor.user_id
 		left JOIN sys_hospital syshos on sysdoctor.hospital_id=syshos.id

--
Gitblit v1.8.0