Merge remote-tracking branch 'origin/master'

tangzy

2021-03-26 afda08833e460a40a2d4e509f9df9d809c6f8f31

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

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


}