Merge remote-tracking branch 'origin/master'

无关风月

3 天以前 70ffa97635e61caa108d3a5262c9a6d86a3eb4c5

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSystemBulletinController.java

@@ -81,7 +81,7 @@
    }
    @Log(title = "启用/禁用系统公告", businessType = BusinessType.OTHER)
    @ApiOperation(value = "启用/禁用系统公告")
    @DeleteMapping(value = "/editStatus")
    @GetMapping(value = "/editStatus")
    public R<Boolean> editStatus(@RequestParam String id) {
        TSystemBulletin byId = systemBulletinService.getById(id);
        if (byId.getStatus()==1){