Merge remote-tracking branch 'origin/master'

李宇

2021-02-04 1afdf3622484b9a54c4cc4642e38bbf5c815884f

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

@@ -472,7 +472,7 @@

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

      return controllers;
   }