From db0b070e51db46e779b8d2ad1d4d213b712602cd Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 11 Jan 2021 17:04:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 src/main/java/org/springblade/modules/equipment/entity/Equipment.java |    2 ++
 1 files changed, 2 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..7604af1 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,8 @@
 	private String serialNumber;
 	private String stype;
 	private String channelNumber;
+	private String pay;
+	private String expireTime;
 
 
 }

--
Gitblit v1.9.3