Merge branch 'feature_chw_zjw2' into dev-chw

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/vo/UsableVeicleVO.java

@@ -29,4 +29,7 @@ public class UsableVeicleVO extends Vehicle {
     @ApiModelProperty(value = "公里数")
     BigDecimal distance;
 
+    private String manageProvinceName;
+
+    private String manageCityName;
 }

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

@@ -1118,6 +1118,8 @@
     <select id="searchUsableVehicle" parameterType="java.util.Map"
             resultType="com.xxfc.platform.vehicle.pojo.vo.UsableVeicleVO">
         select v.*
+        , bcm.province_name as manageProvinceName
+        , bcm.city_name as manageCityName
         <if test="lon != null and lat != null">
             ,st_distance_sphere(point(#{lon}, #{lat}), point(bc.longitude, bc.latitude)) as distance
         </if>
@@ -1187,6 +1189,7 @@
         </if>
         left join vehicle_model vm on v.model_id = vm.id
         left join branch_company bc on v.park_branch_company_id = bc.id
+        left join branch_company bcm on v.manage_company_id = bcm.id
 <!--        <if test="startCompanyId != null and endCompanyId != null ">-->
             <!--
                  * 原（大于预约结束时间，小于预约开始时间的预约记录）