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

cp

2023-02-13 8730e273d5dbf1de6438c12882e69549cf44faf3

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