Merge remote-tracking branch 'origin/master'

zengh

2021-03-18 d5a8a64768db15ff6917e150358a954582e384fd

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

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

}