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

野心家

2023-07-29 675db903cd534aa16b59f5e9bf87da3e699e5d30

 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<>();