Merge remote-tracking branch 'origin/master'

Junjie

3 天以前 2ed2c79a60bea2e05272f11324a0fd148414ae43

 src/main/java/com/zy/core/model/StationObjModel.java

@@ -19,6 +19,9 @@

    private Integer barcodeIdx;

    //站点绑定双工位堆垛机工位
    private Integer dualCrnExecuteStation;

    private StationObjModel barcodeStation;

    private StationObjModel backStation;