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

mitao

2025-03-31 060b84c46d7097696504aea89f77185320815b07

 cloud-server-competition/src/main/java/com/dsh/competition/controller/UserCompetitionController.java

@@ -17,8 +17,5 @@
public class UserCompetitionController {





}