From b6ebb7d8e25fa5505494204abbc54da849ca548e Mon Sep 17 00:00:00 2001
From: nnnjjj123 <494715143@qq.com>
Date: Mon, 11 Jan 2021 17:14:22 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfptManager

---
 src/main/java/org/springblade/modules/equipment/entity/Equipment.java |    3 +++
 1 files changed, 3 insertions(+), 0 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 0c2fd56..6e43b18 100644
--- a/src/main/java/org/springblade/modules/equipment/entity/Equipment.java
+++ b/src/main/java/org/springblade/modules/equipment/entity/Equipment.java
@@ -108,6 +108,9 @@
 	private String serialNumber;
 	private String stype;
 	private String channelNumber;
+	private String pay;
+	private String expireTime;
+	private String heartbeat;
 
 
 }

--
Gitblit v1.9.3