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

whycq

2021-12-30 bf2652a293a744a365c3c966cd1e1c621254f08e

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