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

pang.jiabao

2024-11-10 25fcfa12ceae7dac621b3a5ac671d515167cb23a

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

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

    private String batch;
    private String orderNo;

}