Merge remote-tracking branch 'origin/master'

# Conflicts:
#	cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/SysManualController.java

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/SysManualController.java

@@ -38,6 +38,12 @@ public class SysManualController extends BaseController {
     private SysUserFeignService sysUserFeignService;
 
     @ApiOperation(value = "查询操作手册")
+    @RequestMapping("/listMenuIds")
+    public Object listMenuIds() {
+        return succeed(sysManualService.listMenuIds());
+    }
+
+    @ApiOperation(value = "查询操作手册")
     @RequestMapping("/list")
     public HttpResponseResult<PageInfo<SysManualVo>> list( @RequestBody SysManualQueryInfo queryInfo) {
         return succeed(PageUtil.pageInfo(sysManualService.query(PageUtil.getPage(queryInfo),queryInfo)));
@@ -94,17 +100,9 @@ public class SysManualController extends BaseController {
     }
 
     @ApiOperation(value = "删除帮助手册")
-    @PostMapping("/remove/{id}")
-    public  HttpResponseResult<Boolean>  remove(@PathVariable("id") Long id) throws Exception {
-
-        if (id == null) {
-            return failed("参数错误");
-        }
-        SysManual manual = sysManualService.getById(id);
-        if (YesOrNoEnum.YES.getCode().equals(manual.getStatus().getCode())) {
-            throw  new BizException("启用状态下，不能删除");
-        }
-        sysManualService.removeById(id);
+    @PostMapping("/remove")
+    public Object remove(@RequestBody SysManual sysManual) throws Exception {
+        sysManualService.removeById(sysManual.getId());
         return succeed();
     }