冲突和修改

gdg

2021-01-18 ee2678ecb9e8d686252feed920a7b2284acd54da

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

    }