From 4ed743831863d75f6a00869ed33759d4368be06f Mon Sep 17 00:00:00 2001
From: PQZ <pangqingzhou@gmail.com>
Date: Thu, 8 Aug 2024 10:09:35 +0800
Subject: [PATCH] 1

---
 .../cn/iocoder/yudao/module/custom/vo/CustomerMainRespVO.java | 1 -
 .../src/main/resources/mapper/custom/CustomerCarMapper.xml    | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CustomerMainRespVO.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CustomerMainRespVO.java
index c4659974..22a42ce9 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CustomerMainRespVO.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CustomerMainRespVO.java
@@ -26,7 +26,6 @@ public class CustomerMainRespVO extends CustomerMain {
     List<CustomerMain> attnList;
     /**标签信息*/
     List<BusiLabel> labelList;
-
     /**车辆品牌型号数组*/
     List<String> brandAndModel;
 
diff --git a/dl-module-base/src/main/resources/mapper/custom/CustomerCarMapper.xml b/dl-module-base/src/main/resources/mapper/custom/CustomerCarMapper.xml
index 7ecdf257..c90e9ed1 100644
--- a/dl-module-base/src/main/resources/mapper/custom/CustomerCarMapper.xml
+++ b/dl-module-base/src/main/resources/mapper/custom/CustomerCarMapper.xml
@@ -62,11 +62,13 @@
     <select id="selectCarListByCusId" resultType="cn.iocoder.yudao.module.custom.vo.CarMainRespVO">
         SELECT
         <include refid="baseCarMainColumn"></include>,
-        main.is_owner AS isOwner
+        main.is_owner AS isOwner,bcb.brand_name AS brandStr,bcm.model_name AS modelStr
         FROM
             base_customer_car main
         LEFT JOIN
             base_car_main tbcarm ON main.car_id = tbcarm.id AND tbcarm.deleted = 0
+        LEFT JOIN base_car_brand bcb ON bcb.deleted = 0 AND tbcarm.car_brand = bcb.id
+        LEFT JOIN base_car_model bcm ON bcm.deleted = 0 AND tbcarm.car_model = bcm.id
         WHERE
             main.deleted = 0
         AND