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

whycq

2024-10-22 85ce1fa2f3d894cce2be0faa24551dfca7896ac9

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

@@ -37,6 +37,11 @@
        // 堆垛机站点编号
        private Integer staNo;

        // 堆垛机站点编号
        private Integer staNoOther;
        private Integer staNoOther1;
        private Integer staNoOther2;

        // 排
        private Integer row;