Merge branch 'master-new-bug' into dev

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

@@ -21,7 +21,7 @@
             </if>
         </where>
         GROUP BY c.id
-        ORDER BY c.company_id
+        ORDER BY c.company_id, c.count_date
     </select>
 
     <select id="countByMonth" resultType="com.xxfc.platform.vehicle.pojo.BranchCompanyVehicleCountVo" parameterType="Map">