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

whycq

2023-09-06 b143fe586d7be6c12ec162bf5aebb3a99bff7e32

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