Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev

dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CarMainRespVO.java

@@ -44,4 +44,6 @@ public class CarMainRespVO extends CarMain {
     List<String> brandAndModel;
     /** 车辆类型 */
     private String brandType;
+    /** 车辆logo */
+    private String logoImg;
 }

dl-module-base/src/main/resources/mapper/custom/CarMainMapper.xml

@@ -36,6 +36,7 @@
         SELECT
         <include refid="baseCarMainColumn"></include>,
         bcb.brand_name AS brandStr,
+        bcb.logo_img AS logoImg,
         bcm.model_name AS modelStr
         FROM
             `base_car_main` tbcm
@@ -73,6 +74,9 @@
         <if test="dto.engineNumber != null and dto.engineNumber != ''">
             AND tbcm.engine_number LIKE CONCAT('%',#{dto.engineNumber},'%')
         </if>
+        <if test="dto.userId != null and dto.userId != ''">
+            AND tbcm.user_id = #{dto.userId}
+        </if>
         ORDER BY
               tbcm.car_register_date DESC
     </select>