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

luliqiang

2020-08-15 f0596fb2bf8fd0ecd8332b176549dad290a6a78d

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorTempleteMapper.xml

@@ -105,7 +105,9 @@
WHERE
   is_del = 0
   AND enabled = 1
   AND templete_type = #{p.templeteType}
   <if test="p.templeteType!=null and p.templeteType!=''">
        AND templete_type = #{p.templeteType}
    </if>
   AND((
         hospital_id IS NULL
         AND hospital_id IS NULL