Merge branch 'feature_chw_zjw2' into dev-chw

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

@@ -1225,7 +1225,7 @@
             <!-- 若需根据预定日期条件查询，针对换为位操作  -->
                 <!-- yearNo4Where 标识时间参数是否用于where条件 -->
             <if test=" yearMonthAndParam !=null and yearMonthAndParam != null and (yearNo4Where == null or yearNo4Where != true)">
-                vbi.bit_str = #{yearMonthAndParamBitStr}
+                and vbi.bit_str = #{yearMonthAndParamBitStr}
             </if>
 
             <if test=" yearNo4Where != null and recordIntersection != null and recordIntersection == true">