Merge remote-tracking branch 'origin/master'

qmjszx-admin/src/main/java/beilv/web/controller/stadium/StadiumController.java

@@ -31,9 +31,9 @@ public class StadiumController extends BaseController {
     /**
      * 查询赛事发布列表
      */
-    @PostMapping("/list")
+    @PostMapping("/getCompetitionList")
     @ResponseBody
-    public AjaxResult list(Competition competition) {
+    public AjaxResult getCompetitionList(Competition competition) {
         startPage();
         competition.setCompetitionState("competiton_state_2");
         List<Competition> list = competitionService.selectCompetitionList(competition);