Merge remote-tracking branch 'origin/dev' into dev

luliqiang

2020-07-15 02dcc4c9d043c44d0fa88490904046008fcf4afc

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

@@ -22,7 +22,7 @@
                and hospital_id = #{p.hospitalId}
            </if>
            <if test="p.hospitalName != null and p.hospitalName !=''">
                and hospital_name = #{p.hospitalName}
                and hospital_name like '%${p.hospitalName}%'
            </if>
            <if test="p.departmentId != null and p.departmentId !=''">
                and department_id = #{p.departmentId}