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

whycq

2022-08-08 804ab6b65fd396e8cde3fd5ad0999ee593496476

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