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

puzhibing

2024-03-11 75d8795d4a8444071f348be4082455f2ca078ffe

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

 cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup_info.js

@@ -162,7 +162,7 @@
        'stores': JSON.stringify(WorldCupInfo.stores)
    }
    if(null != registrationClosingTime && '' != registrationClosingTime){
        data.registrationClosingTime = registrationClosingTime;
        data.registrationClosingTime = new Date(registrationClosingTime + " 23:59:59");
    }

    //提交信息
@@ -325,7 +325,7 @@
        'stores': JSON.stringify(WorldCupInfo.stores)
    }
    if(null != registrationClosingTime && '' != registrationClosingTime){
        data.registrationClosingTime = registrationClosingTime;
        data.registrationClosingTime = new Date(registrationClosingTime + " 23:59:59");
    }

    //提交信息

 cloud-server-management/src/main/webapp/static/modular/system/worldCupRecords/worldCupGameStatisticsInfo.js

@@ -55,7 +55,7 @@
            area: ['100%', '100%'], //宽高
            fix: false, //不固定
            maxmin: true,
            content: Feng.ctxPath + '/worldCupRecords/openWorldCupGameStatisticsListInfo?id=' + WorldCupGameStatisticsInfo.seItem.id
            content: Feng.ctxPath + '/worldCupRecords/openWorldCupGameStatisticsListInfo?participantId=' + WorldCupGameStatisticsInfo.seItem.participantId + "&participantType=" + WorldCupGameStatisticsInfo.seItem.participantType
        });
        this.layerIndex = index;
    }