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

无关风月

7 天以前 c560f1a14ae1fc468d90e50e6a32d805295875da

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

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