Merge branch 'master_activity' into dev

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/controller/ActivityController.java

@@ -69,7 +69,7 @@ public class ActivityController extends BaseController<ActivityBiz, Activity> {
     }
 
 
-    @PutMapping("/remove/{id}")
+    @DeleteMapping("/remove/{id}")
     @ApiOperation(value = "删除",notes = "删除")
     public ObjectRestResponse remove(@PathVariable Integer id ){
         if (baseBiz.remove(id)) {