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

cl

1 天以前 f95a3c836f06078f41389051a9d1c01969a925cb

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

@@ -20,6 +20,8 @@

    private Integer offset;

    private Boolean demo;

    // 堆垛机入库站点
    private List<CrnStn> crnInStn = new ArrayList<>();