Merge remote-tracking branch 'origin/master'

ZengTao

4 天以前 994b07344c976abcb33ff5eaecd685f6461be5ea

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/config/S7Config.java

@@ -27,4 +27,9 @@
        return S7Serializer.newInstance(s7PLC);
    }

    @Bean(name = "s7plcWZL")
    public S7PLC s7plcWZL() {
        return new S7PLC(EPlcType.S1200, "192.168.20.160");
    }

}