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/TContractAppletQuery.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TContractAppletQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TContractAppletQuery.java
new file mode 100644
index 0000000..574eac1
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TContractAppletQuery.java
@@ -0,0 +1,16 @@
+package com.ruoyi.system.query;
+
+import com.ruoyi.common.core.domain.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "我的合同分页列表查询Query")
+public class TContractAppletQuery extends BasePage {
+
+    @ApiModelProperty(value = "全部不传 3=待签订 4=已签订")
+    private Integer status;
+    @ApiModelProperty(value = "租户id 前端忽略")
+    private String tenantId;
+}

--
Gitblit v1.7.1