Merge branch 'master-vehicle-bg' into dev

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

@@ -4,8 +4,8 @@
 
     <select id="getAllCountInfo" parameterType="Map" resultType="com.xxfc.platform.vehicle.pojo.BranchCompanyVehicleCountVo">
         SELECT
-        c.company_id as companyId,
-        c.count_date as countDate,
+        c.company_id,
+        c.count_date,
         b.`name` AS companyName,
         sum(c.vehicle_num) as vehicleNum
         FROM