Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-12-12 312cd22230809437aae8462d71d3335e6540f78a

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java

@@ -405,7 +405,7 @@
        }
    }


    @ResponseBody
    @RequestMapping(value = "/cancel")
    public Object cancel(Integer TCompetitionId) {
        try {
@@ -416,7 +416,7 @@
            return ERROR;
        }
    }

    @ResponseBody
    @RequestMapping(value = "/getPeopleFromId")
    public Object getPeopleFromId(Integer id,Integer state) {
        try {