From 5ee338a5e19319386f2f6298d22a8e4ac96dc7cb Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 06 May 2021 15:24:42 +0800
Subject: [PATCH] 1.设备故障状态合并到设备状态中，设备状态接口修改 2.警情处理完成后修改设备状态为正常，修改警情处理接口

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/entitly/catalog.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/entitly/catalog.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/entitly/catalog.java
index 373ec0a..48aed0f 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/entitly/catalog.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/entitly/catalog.java
@@ -36,13 +36,14 @@
 
 	private static final long serialVersionUID = 1L;
 
-	private Integer id;
+	private Long id;
 	@TableField("name")
 	private String name;
 	@TableField("pId")
-	private Integer pId;
+	private Long pId;
 	@TableField("eqid")
 	private String eqid;
+	private String tenant_id;
 
 
 }

--
Gitblit v1.9.3