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

lyfO_o

2021-06-25 178788d231d7d891c1874635b8e11dd951fc4230

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

@@ -218,6 +218,9 @@
                }
                valuesList.add(cellInfo);
            }
            if (valuesList.size() != 4){
                break;
            }

            SysSupplier sysSupplier = new SysSupplier();
            //这一行有供应商是数据库里的就跳过