Merge remote-tracking branch 'origin/master'

zengh

2021-04-25 2297c50a14f92dd869edae212d4aabe8f0bf0572

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

@@ -369,6 +369,10 @@
//         catalogService.updateCatalog(deviceName,deviceNumber,pId);
//      }

      if (equipment.getPaddress() != null && !equipment.getPaddress().equals("")) {
         equipmentService.saveImg(equipment);
      }

      System.out.println(equipment.getDeptId());
      return R.status(equipmentService.saveOrUpdate(equipment));
   }