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

luofl

2025-04-11 2fc4d1e0a7d1e786c99f3d113ac4449be2659c3f

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

@@ -16,5 +16,5 @@
     * @param id
     * @return
     */
    ResultUtil cancelMyWorldCup(String id);
    ResultUtil cancelMyWorldCup(Long id);
}