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

zhang

8 天以前 5833f3f3aa5313fa1170cd9ab0c5857f964ba96c

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

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

    private String batch;
    private String orderNo;

}