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 | 2 ++
1 files changed, 2 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
index 5698fb3..574eac1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TContractAppletQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TContractAppletQuery.java
@@ -11,4 +11,6 @@
@ApiModelProperty(value = "全部不传 3=待签订 4=已签订")
private Integer status;
+ @ApiModelProperty(value = "租户id 前端忽略")
+ private String tenantId;
}
--
Gitblit v1.7.1