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

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TFaultRepairMessageAppletQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TFaultRepairMessageAppletQuery.java
index a7a772c..aa43d32 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TFaultRepairMessageAppletQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TFaultRepairMessageAppletQuery.java
@@ -11,4 +11,6 @@
 
     @ApiModelProperty(value = "房屋地址")
     private String houseAddress;
+    @ApiModelProperty(value = "处理状态 1=待处理 2=已处理")
+    private Integer status;
 }

--
Gitblit v1.7.1