From 71b6b716361c52af290493d365a328fc1a3467e2 Mon Sep 17 00:00:00 2001
From: nnnjjj123 <494715143@qq.com>
Date: Thu, 28 Jan 2021 11:15:06 +0800
Subject: [PATCH] 1.统计接口 2.健康码
---
src/main/java/org/springblade/modules/equipment/entity/Equipment.java | 76 ++++++++++++++++++++-----------------
1 files changed, 41 insertions(+), 35 deletions(-)
diff --git a/src/main/java/org/springblade/modules/equipment/entity/Equipment.java b/src/main/java/org/springblade/modules/equipment/entity/Equipment.java
index 3cdfed6..6e43b18 100644
--- a/src/main/java/org/springblade/modules/equipment/entity/Equipment.java
+++ b/src/main/java/org/springblade/modules/equipment/entity/Equipment.java
@@ -19,8 +19,11 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+
import java.time.LocalDateTime;
+
import com.baomidou.mybatisplus.annotation.TableField;
+
import java.io.Serializable;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -47,49 +50,49 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
- * 设备名称
- */
- @ApiModelProperty(value = "设备名称")
- @TableField("deviceName")
+ * 设备名称
+ */
+ @ApiModelProperty(value = "设备名称")
+ @TableField("deviceName")
private String deviceName;
/**
- * 设备编码
- */
- @ApiModelProperty(value = "设备编码")
- @TableField("deviceNumber")
+ * 设备编码
+ */
+ @ApiModelProperty(value = "设备编码")
+ @TableField("deviceNumber")
private String deviceNumber;
/**
- * 设备类型
- */
- @ApiModelProperty(value = "设备类型")
- @TableField("deviceType")
+ * 设备类型
+ */
+ @ApiModelProperty(value = "设备类型")
+ @TableField("deviceType")
private String deviceType;
/**
- * 权属
- */
- @ApiModelProperty(value = "权属")
- private String ownership;
+ * 权属
+ */
+ @ApiModelProperty(value = "权属")
+ private String ownership;
/**
- * 业主id
- */
- @ApiModelProperty(value = "业主id")
- @TableField("ownerId")
+ * 业主id
+ */
+ @ApiModelProperty(value = "业主id")
+ @TableField("ownerId")
private String ownerId;
/**
- * 设备状态
- */
- @ApiModelProperty(value = "设备状态")
- private int devicestate;
+ * 设备状态
+ */
+ @ApiModelProperty(value = "设备状态")
+ private String devicestate;
/**
- * 提交日期
- */
- @ApiModelProperty(value = "提交日期")
- private String stime;
+ * 提交日期
+ */
+ @ApiModelProperty(value = "提交日期")
+ private String stime;
/**
- * 空间坐标
- */
- @ApiModelProperty(value = "空间坐标")
- private String coordinate;
+ * 空间坐标
+ */
+ @ApiModelProperty(value = "空间坐标")
+ private String coordinate;
/**
* 菜单父主键
*/
@@ -102,9 +105,12 @@
private String addvcd;
private String street;
private String dtype;
-
-
-
+ private String serialNumber;
+ private String stype;
+ private String channelNumber;
+ private String pay;
+ private String expireTime;
+ private String heartbeat;
}
--
Gitblit v1.9.3