Merge remote-tracking branch 'origin/master'

zengh

2021-03-12 70f01fd17bb642c2f773d5c5567018d7573a2dde

 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;

}