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

zhang

2025-08-30 8f6ebf95e57c6f39ec11002de79bf6ed16844a5c

 src/main/java/com/zy/common/entity/OutLocBoxExcel.java

@@ -18,5 +18,6 @@
public class OutLocBoxExcel extends OutLocBoxVo {

    private String batch;
    private String orderNo;

}