Merge branch 'dev1.1' into dev

zhaoxiaohao

2021-03-01 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1

 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