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/ProcessTaskListBO.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/bo/ProcessTaskListBO.java b/ruoyi-system/src/main/java/com/ruoyi/system/bo/ProcessTaskListBO.java
new file mode 100644
index 0000000..750a429
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/bo/ProcessTaskListBO.java
@@ -0,0 +1,52 @@
+package com.ruoyi.system.bo;
+
+import com.ruoyi.common.core.domain.BasePage;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Setter
+@Getter
+public class ProcessTaskListBO extends BasePage {
+ /**
+ * 任务名称
+ */
+ @ApiModelProperty(value = "任务名称")
+ private String name;
+
+ /**
+ * 任务名称
+ */
+ @ApiModelProperty(value = "任务名称")
+ private String moduleName;
+// /**
+// * 流程实例状态（ 0，审批中 1，审批通过 2，审批拒绝 3）
+// */
+// private Integer instanceState;
+ /**
+ * 创建人
+ */
+ @ApiModelProperty(value = "创建人")
+ private String createBy;
+
+ @ApiModelProperty(value = "乙方名称")
+ private String partyTwoName;
+ @ApiModelProperty(value = "合同编号")
+ private String contractNumber;
+ @ApiModelProperty(value = "合同名称")
+ private String contractName;
+ @ApiModelProperty(value = "合同状态")
+ private String status;
+ @ApiModelProperty(value = "前端忽略")
+ private List<String> instanceIds;
+
+ @ApiModelProperty(value = "时间筛选 1=1天 2=7天 3=30天")
+ private Integer timeType;
+
+ @ApiModelProperty(value = "排序 1=最早到达 2=最新到达")
+ private Integer sortBy=2;
+
+
+}
--
Gitblit v1.7.1