From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-system/src/main/java/com/ruoyi/system/bo/ProcessAgreeBO.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/bo/ProcessAgreeBO.java b/ruoyi-system/src/main/java/com/ruoyi/system/bo/ProcessAgreeBO.java
new file mode 100644
index 0000000..b52551e
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/bo/ProcessAgreeBO.java
@@ -0,0 +1,36 @@
+package com.ruoyi.system.bo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 流程审批请求参数 同意
+ *
+ * <p>
+ * 尊重知识产权，不允许非法使用，后果自负
+ * </p>
+ *
+ */
+@Data
+public class ProcessAgreeBO {
+
+ /**
+ * 任务id
+ */
+ private String taskId;
+
+ /**
+ * 理由
+ */
+ private String remark;
+ /**
+ * 图片
+ */
+ private String pictures;
+ /**
+ * 审批用户id
+ */
+ @ApiModelProperty(value = "前端忽略")
+ private Long userId;
+
+}
--
Gitblit v1.7.1