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

puzhibing

2024-03-01 e0ec0a20cb943b4ee92c45b64f02b007a003b0ba

 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/IWorldCupService.java

@@ -4,6 +4,7 @@
import com.dsh.communityWorldCup.entity.WorldCup;
import com.dsh.communityWorldCup.model.*;
import com.dsh.communityWorldCup.util.ResultUtil;
import org.springframework.web.bind.annotation.RequestBody;

import java.util.List;

@@ -50,7 +51,7 @@
     * @param id
     * @return
     */
    WorldCupInfo getWorldCupInfo(Integer id);
    WorldCupInfo getWorldCupInfo(Integer id, String lon, String lat);


    /**