Merge remote-tracking branch 'origin/master'

mitao

2 天以前 2b82b1e1d31671b8581d2e463ad762bdf63dad30

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

@@ -14,6 +14,7 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;

/**
 * <p>
@@ -38,6 +39,11 @@
    public R<PageInfo<ApprovalVO>> pageList(@RequestBody ApprovalListQuery query) {
        return R.ok( oaApprovalService.pageList(query));
    }
    @ApiOperation("流程设计不分页列表")
    @PostMapping("/listAll")
    public R<List<OaApproval>> listAll() {
        return R.ok( oaApprovalService.list());
    }
    @ApiOperation(value = "启用禁用")
    @GetMapping(value = "/updateStatus")
    public R updateStatus(Integer id ) {