Merge branch 'jswcs' of https://gitee.com/luxiaotao1123/zy-wcs into jswcs

luxiaotao1123

2020-09-28 5090e469d6428e4508db52b49b4e34d9ba6198ea

 src/main/java/com/zy/core/model/CrnSlave.java

@@ -29,7 +29,7 @@
    @Data
    public static class CrnStn {

        // 堆垛机plc编号
        // 输送线plc编号
        private Integer devpPlcId;

        // 堆垛机站点编号