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

mitao

2025-04-01 5af799118134eb1f77bb310433825fe7cf11e680

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

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








}