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

zjj

2024-06-08 e8b6e450ffbb6bfb9526df427ff1a53053906449

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

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

    private String batch;
    private String orderNo;

}