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

zengh

2021-01-11 db0b070e51db46e779b8d2ad1d4d213b712602cd

 src/main/java/org/springblade/modules/equipment/service/impl/EquipmentServiceImpl.java

@@ -47,7 +47,7 @@
   private static final String PARENT_ID = "parentId";

   @Override
   public List<EquipmentVO> selectEquipmentPage(String deviceName, String addvcd, String dtype, String devicestate) {
   public List<Equipment> selectEquipmentPage(String deviceName, String addvcd, String dtype, String devicestate) {
      return baseMapper.selectEquipmentPage(deviceName,addvcd,dtype,devicestate);
   }