Merge remote-tracking branch 'origin/2.0' into 2.0

mitao

2025-04-11 8afc5bfc1e5df1e2f0a8872a344da3b3fd5d63b9

 cloud-server-management/src/main/webapp/static/modular/system/tCompetitionAudit/tCompetition_info.js

@@ -523,7 +523,7 @@
var marker;
//搜索地图
TCarInfoDlg.searchByStationName = function(e,type){
    var keyword="成都";
    var keyword="";
    if(type==2){
        keyword = $(e).parent().prev().find("input").val();
    }else {