Merge remote-tracking branch 'origin/master'

nickchange

2023-12-08 1b9a01bf5000714b08a75a50dd1f5f3eab65d888

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

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





}