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

Junjie

2025-08-01 85348794065f9fe83896733360f289879a035376

 src/main/java/com/zy/asrs/entity/OrderDetl.java

@@ -610,7 +610,6 @@
                        && this.boxType1.equals(orderDetl.getBoxType1())
                        && this.boxType2.equals(orderDetl.getBoxType2())
                        && this.boxType3.equals(orderDetl.getBoxType3())
                        && this.cstateid.equals(orderDetl.getCstateid())
        );
    }

@@ -625,7 +624,6 @@
                        && this.boxType1.equals(orderDetl.getBoxType1())
                        && this.boxType2.equals(orderDetl.getBoxType2())
                        && this.boxType3.equals(orderDetl.getBoxType3())
                        && this.cstateid.equals(orderDetl.getCstateid())
        );
    }