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

lyfO_o

2021-03-31 e1cce0b77f02cf43024a6142bf49d75566ac2181

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

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

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

      return controllers;
   }