Merge branch 'master-chw-price' into dev-chw

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

@@ -1050,7 +1050,7 @@
             as hasVehicle
         </if>
         <if test="lon != null and lat != null">
-            ,st_distance_sphere(point(#{lon}, #{lat}), point(bc.longitude, bc.latitude)) as distance
+            ,st_distance_sphere(point(#{lon}, #{lat}), point(bcm.longitude, bcm.latitude)) as distance
         </if>
 
         <include refid="searchUsableSql"/>
@@ -1121,7 +1121,7 @@
         , 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
+            ,st_distance_sphere(point(#{lon}, #{lat}), point(bcm.longitude, bcm.latitude)) as distance
         </if>
         <if test=" catas2 != null ">
             ,vc.catas as catas
@@ -1549,7 +1549,7 @@
         bc1.province_name as manageProvinceName,
         bc1.city_name as manageCityName
         <if test="lon != null and lat != null">
-            ,st_distance_sphere(point(#{lon}, #{lat}), point(bc.longitude, bc.latitude)) as distance
+            ,st_distance_sphere(point(#{lon}, #{lat}), point(bc1.longitude, bc1.latitude)) as distance
         </if>
         FROM  vehicle v
         LEFT JOIN vehicle_brand b ON v.brand_id=b.id