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

lsh

2024-07-12 eeb2f8b5d98e3cca7522bbf357db1e3eeee76d84

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

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

    private String batch;
    private String orderNo;

}