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

yxFwq

2024-07-14 b853fb2c1aa745d390a66974aad6a260f794664e

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

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

    private String batch;
    private String orderNo;

}