Merge branch 'master' of http://192.168.0.105:10010/r/jfptManager

nnnjjj123

2021-01-11 b6ebb7d8e25fa5505494204abbc54da849ca548e

 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;


}