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

gdg

2021-02-23 3cc43725fa2e4b8ed4b4b00b845a7dc83f99f39a

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

@@ -471,7 +471,7 @@
   }

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

      return controllers;
   }