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

无关风月

2 天以前 2b2e8603381d62b5da4a817710b33d583561ff3f

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

@@ -16,5 +16,6 @@
@RequestMapping("/user_competition")
public class UserCompetitionController {


}