From 70a29ae28b85643e00a4b7fbf111a95646a24dc2 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 20 Mar 2024 17:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java b/src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java
index b4477c3..8775ed7 100644
--- a/src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java
+++ b/src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java
@@ -28,7 +28,6 @@
 import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.tenant.mp.TenantEntity;
 import org.springframework.format.annotation.DateTimeFormat;
-import sun.rmi.runtime.Log;
 
 /**
  * 报事报修任务表 实体类
@@ -126,4 +125,10 @@
 	 */
 	@ApiModelProperty(value = "临时用  1：已查看  2：未查看")
 	private Integer viewType;
+
+	/**
+	 * 1：房屋 2：场所
+	 */
+	@ApiModelProperty(value = "1：房屋 2：场所")
+	private Integer houseFlag;
 }

--
Gitblit v1.9.3