Merge remote-tracking branch 'origin/master'

tangzy

2021-03-23 3f5d52e4e78b7a6b9f8425287236c6f5ea0fb81e

 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;

}