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

gdg

2021-01-18 3ec412f3cdc8b114cf629e866a7b7b80687a3442

 src/main/java/com/nanometer/smartlab/service/SysControllerServiceImpl.java

@@ -197,6 +197,8 @@
            sysController.setControllerName(controlName);
            sysController.setType(typeMap.get(controlType));
            sysControllerService.insertSysController(sysController);
            controllerInfo.add(controlName);
            controllerInfo.add(controlCode);
         }

    }