Merge branch 'dev'

zhaoxiaohao

2020-09-18 daa697719eb0ddfd170f1ab94c5422a4f5b93951

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml

@@ -150,6 +150,9 @@
      left JOIN sys_hospital syshos on sysdoctor.hospital_id=syshos.id
      left JOIN sys_department sysdep on sysdoctor.department_id=sysdep.id
      where sysuser.id=#{userId}
      and sysuser.is_del=0 and sysuser.enabled=1
      and syshos.is_del=0 and syshos.enabled=1
      and sysdep.is_del=0 and sysdep.enabled=1
   </select>
    <select id="hospitalDoctorList" parameterType="long" resultType="com.kidgrow.usercenter.vo.HospitalDoctorListVo">
        SELECT