Merge remote-tracking branch 'origin/master'

zengh

2021-04-23 670bc85ba8468dbe9a427abc54f2bca9d4e71749

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java

@@ -37,5 +37,17 @@
   String expireTime;
   private  String beginTime;
   private  String endTime;
   private  String pid;
   private String onlineStatus;

   //设备是否处于报警状态
   String jtype;

   String contacts;
   String call;
   String paddress;
   String deploymentTime;



}