Merge remote-tracking branch 'origin/master'

钟日健

2021-02-24 c302589567b7b556d8dfd7fca8cf3cf215d1a390

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

@@ -35,5 +35,7 @@
   int type;
   String pay;
   String expireTime;
   private  String beginTime;
   private  String endTime;

}