Merge remote-tracking branch 'origin/master'

Administrator

2021-03-02 a644c4bb75b173d14fad9ed7dc7cf85c41d4953a

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java

@@ -343,7 +343,9 @@
      if (equipment.getHeartbeat() != null && equipment.getHeartbeat().equals("")) {
         equipment.setHeartbeat(null);
      }

      String deviceName = equipment.getDeviceName();
      String deviceNumber = equipment.getDeviceNumber();
      catalogService.updateCatalog(deviceName,deviceNumber);
      return R.status(equipmentService.saveOrUpdate(equipment));
   }