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

gdg

2021-02-03 a3de8fe47c3eddc8cb086803db68c1bd0cd7c1b7

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

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

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

      return controllers;
   }