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

# Conflicts:
#	mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/PublishController.java

mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/PublishController.java

@@ -1,6 +1,11 @@
 package com.mcwl.web.controller.communityCenter;
 
 
+import cn.hutool.core.bean.BeanUtil;
+import com.mcwl.common.core.domain.AjaxResult;
+import com.mcwl.common.core.page.PageDomain;
+import com.mcwl.common.core.page.TableDataInfo;
+import com.mcwl.communityCenter.domain.Community;
 import cn.hutool.core.bean.BeanUtil;
 import com.mcwl.common.core.domain.AjaxResult;
 import com.mcwl.common.core.page.PageDomain;
@@ -14,9 +19,6 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.Objects;
 
-/**
- * 发布
- */
 @RestController
 @RequestMapping("publish")
 @RequiredArgsConstructor
@@ -66,4 +68,15 @@ public class PublishController {
         return AjaxResult.success(publishService.removeById(id));
     }
 
+    /**
+     * 删除
+     */
+    @GetMapping("remove")
+    public AjaxResult deletePublish(Long id) {
+        return AjaxResult.success(publishService.removeById(id));
+    }
+
+
+
+
 }