Merge remote-tracking branch 'origin/master'

李宇

2021-02-04 1afdf3622484b9a54c4cc4642e38bbf5c815884f

 src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java

@@ -471,10 +471,8 @@
   }

   public List<SysController> getControllers() {
      if(controllers == null)
      {
         this.controllers = sysControllerService.getAllControllerList();
      }
      this.controllers = sysControllerService.getAllControllerList();

      return controllers;
   }