Merge remote-tracking branch 'origin/master'

railway-business/src/main/resources/mapper/catenary/BusJlgzMapper.xml

@@ -262,5 +262,6 @@
       GROUP BY jlgz.yylx
     ) res right join sys_dict_data dictYylx on res.yylx = dictYylx.dict_value
     where dictYylx.dict_type = 'gzyy'
+    order by ifnull(res.total,0) desc, dictYylx.dict_sort
   </select>
 </mapper>