Merge branch 'master-rentvehicle'

xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml

@@ -265,7 +265,7 @@
                 and username like CONCAT ("%", #{realName}, "%")
             </if>
             <if test="keywords != null and keywords != ''">
-                and (telephone like CONCAT ("%", #{phone}, "%") or username like CONCAT ("%", #{realName}, "%"))
+                and (telephone like CONCAT ("%", #{keywords}, "%") or username like CONCAT ("%", #{keywords}, "%"))
             </if>
 
             <if test="userId != null">