From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyEquipmentVO.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyEquipmentVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyEquipmentVO.java
index 928efef..17c76c6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyEquipmentVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyEquipmentVO.java
@@ -9,7 +9,7 @@
@Data
@ApiModel("设备实体")
public class ComPropertyEquipmentVO {
- private Integer id;
+ private String id;
/**
* 设备编号
@@ -62,7 +62,7 @@
/**
* 设备类型
*/
- @ApiModelProperty(value = "设备类型 1红外报警 2一键报警 ")
+ @ApiModelProperty(value = "设备类型 1一键报警 2异常报警 ")
private Integer type;
@ApiModelProperty(value = "手机号")
@@ -73,4 +73,7 @@
@ApiModelProperty(value = "回显路径")
private String path;
+
+ @ApiModelProperty(value = "设备状态（1.待服务 2.有异常报警 3.正常）")
+ private Integer equipmentStatus;
}
--
Gitblit v1.7.1