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

puzhibing

2024-03-11 334fbd5f1a5a4e85c198560bd024211ba4cf99b1

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

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








}