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

gdg

2021-01-26 78ea95ba31e63279b46d47c5c9ca983f3e0c8d47

 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);
         }

    }