From 2b82b1e1d31671b8581d2e463ad762bdf63dad30 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 17 十月 2025 16:43:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalController.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalController.java
index 16acef2..a87d9c7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalController.java
+++ b/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 ) {
--
Gitblit v1.7.1