Merge remote-tracking branch 'origin/master'

puzhibing

2023-12-11 66107e6f0bb5c47192eb0178aba60dc9df061be8

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

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





}