Merge remote-tracking branch 'origin/master' into master

zengh

2021-02-03 5a90071cd2797bcacc286fcad31a8b0b0875d6aa

 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;

}