Merge remote-tracking branch 'origin/master'

zengh

2021-03-24 f34a510629676ebf22d75bde2e89e2fe4a2f56be

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

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

}