Merge remote-tracking branch 'origin/master'

zengh

2021-04-06 d7dd6cbbad5213476bd1e98d65fee6056ad4c2fc

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

@@ -49,5 +49,4 @@
   private String twoId;
   private String threeId;


}