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

houruijun

2020-11-02 f14deee7baaf82e7aad6fc81a2509ba88e869afd

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

@@ -302,7 +302,7 @@
        hospital_name
        from sys_hospital
        where is_del=0 and enabled=1 and hospital_name LIKE concat('%',#{hospitalName},'%')
        order by hospital_name desc
        order by hospital_name desc,id desc
    </select>
    <select id="chartHospital" resultType="int" parameterType="int">
        SELECT