Merge remote-tracking branch 'origin/dev-chw' into dev-chw

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

@@ -6,9 +6,13 @@
     <select id="selectList"  resultType="com.xxfc.platform.vehicle.pojo.vo.VehicleApplyVo" parameterType="com.xxfc.platform.vehicle.pojo.dto.VehicleApplyFindDTO">
         SELECT
         a.*,
-        i.`name` as companyName
+        i.`name` as companyName,
+        b.cn_name as brandName,
+        c.`name` categoryName
         FROM vehicle_apply a
         LEFT JOIN branch_company i on a.subordinate_branch=i.id
+        LEFT JOIN vehicle_brand b ON a.brand_id=b.id
+        LEFT JOIN vehicle_category c ON a.category_id=c.id
         <where>
               a.is_del = 0
             <if test="name != null and  name != ''">