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/query/TExamineAppletQuery.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TExamineAppletQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TExamineAppletQuery.java
new file mode 100644
index 0000000..e2d4612
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TExamineAppletQuery.java
@@ -0,0 +1,36 @@
+package com.ruoyi.system.query;
+
+import com.ruoyi.common.core.domain.BasePage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel(value = "我的审批查询query")
+public class TExamineAppletQuery extends BasePage {
+ /**
+ * 1待审批 2已审批 3我发起的
+ */
+ @ApiModelProperty("1待审批 2已审批 3我发起的")
+ private Integer status;
+ /**
+ * 时间 1最近1天 2最近7天 3最近30天
+ */
+ @ApiModelProperty("时间全部不传 1最近1天 2最近7天 3最近30天")
+ private Integer time;
+ /**
+ * 1倒序 2正序 首次默认倒序排
+ */
+ @ApiModelProperty("最新到达1倒序 最早到达2正序 首次默认倒序排")
+ private Integer sort;
+ @ApiModelProperty("登陆人名称 前端忽略")
+ private String userName;
+
+
+
+
+
+}
--
Gitblit v1.7.1