Merge remote-tracking branch 'origin/master'

ruoyi-system/src/main/resources/mapper/system/TPatientMapper.xml

@@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTPatientVo"/>
         <where>
         <if test="delFlag != null and delFlag != ''">
-            and delFlag = #{delFlag}
+            and del_flag = #{delFlag}
         </if>
         <if test="phone != null and phone != ''">
            and phone = #{phone}