From 670bc85ba8468dbe9a427abc54f2bca9d4e71749 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 23 Apr 2021 16:32:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/entity/Equipment.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/entity/Equipment.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/entity/Equipment.java
index 8a06736..c35ab2f 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/entity/Equipment.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/entity/Equipment.java
@@ -86,8 +86,8 @@
/**
* 空间坐标
*/
- @ApiModelProperty(value = "空间坐标")
- private String coordinate;
+// @ApiModelProperty(value = "空间坐标")
+// private String coordinate;
/**
* 菜单父主键
*/
@@ -100,15 +100,41 @@
private String addvcd;
private String street;
private String dtype;
+ @TableField("serialNumber")
private String serialNumber;
private String stype;
+ @TableField("channelNumber")
private String channelNumber;
private String pay;
+ @TableField("expireTime")
private String expireTime;
private String heartbeat;
private String province;
private String city;
private String district;
+ private String state;
+ private String reason;
+ @TableField("deptId")
+ private String deptId;
+
+ @TableField("onePhone")
+ private String onePhone;
+ @TableField("twoPhone")
+ private String twoPhone;
+ @TableField("ThreePhone")
+ private String ThreePhone;
+ @TableField("oneId")
+ private String oneId;
+ @TableField("twoId")
+ private String twoId;
+ @TableField("threeId")
+ private String threeId;
+ @TableField("oneContacts")
+ private String oneContacts;
+ @TableField("twoContacts")
+ private String twoContacts;
+ @TableField("ThreeContacts")
+ private String ThreeContacts;
}
--
Gitblit v1.9.3