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

lyfO_o

2021-10-27 ea2b42d0ab6cd96118ddb030bbc3901149d6aaa7

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

@@ -171,6 +171,11 @@
               }
               valuesList.add(cellInfo);
            }

            if (valuesList.size() != 3){
               break;
            }

            //重名判断
            String controlName = valuesList.get(0);
            if (controllerInfo.contains(controlName)){