Merge remote-tracking branch 'origin/master'

boman-web-core/src/main/resources/mapper/VaccineInfoMapper.xml

@@ -303,7 +303,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, user_name ,gender, birthday,age from vaccine_info
         <where>
             is_del = 'N'
-         <if test="idCard != null and idCard != '' ">id_card = #{idCard}</if>
+         <if test="idCard != null and idCard != '' "> and id_card = #{idCard}</if>
         </where>
         limit 1
     </select>