From 27d8f8fbb2e02be63338b80f808969faa35adac0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 19 九月 2025 11:36:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/dto/SetApprovalDTO.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/SetApprovalDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/SetApprovalDTO.java
index 6be1e51..d9751c2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/dto/SetApprovalDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/SetApprovalDTO.java
@@ -12,7 +12,9 @@
 
     @ApiModelProperty(value = "审批流程id")
     private Integer id;
+    @ApiModelProperty(value = "审批类型 0-上级部门,1-指定部门审批,2-指定人员审批")
+    private Integer approvalType;
 
-    @ApiModelProperty(value = "人员ids")
+    @ApiModelProperty(value = "审批类型为上级部门该字段不传,指定部门审批存部门id,指定人员审批存人员id,多个id使用英文逗号拼接")
     private String approvalIds;
 }

--
Gitblit v1.7.1