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

luofl

2025-04-11 a9edc2f62628007e2c5e86d416d484780238f13f

 cloud-server-other/src/main/java/com/dsh/other/util/TaskUtilCompetition.java

@@ -20,10 +20,4 @@
    private SiteBookingMapper siteBookingMapper;








}