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

whycq

2022-12-03 08192aa7aebc8ca582b61fe2803dcd877329eca3

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