Merge branch 'master-background-manager' into base-modify

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleBookRecordMapper.xml

@@ -486,6 +486,9 @@
             <if test="keywords != null and keywords != ''">
                 and (v3.number_plate like concat('%', #{keywords}, '%') or v3.code like concat('%', #{keywords}, '%'))
             </if>
+            <if test="zoneId != null">
+                and bc3.zone_id = #{zoneId}
+            </if>
             <if test="companyIds != null and companyIds.size > 0">
                 and (v1.lift_company in
                 <foreach collection="companyIds" item="id" open="(" separator="," close=")">