Merge branch 'master-ucc-feature'

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

@@ -91,6 +91,6 @@
         <if test="cityCode != null">
            AND  `addr_city`=#{cityCode}
         </if>
-        ) AS `cb` ON cb.id = bc.company_base_id ORDER  BY `id`
+        ) AS `cb` ON cb.id = bc.company_base_id ORDER  BY bc.id
     </select>
 </mapper>
\ No newline at end of file