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

whycq

2023-10-11 8f0d649d83de955cfcbf38ebdbfc90a70c6ac547

 src/main/java/com/zy/common/model/DetlDto.java

@@ -15,6 +15,8 @@

    private String orderNo;

    private String orderNo$;

    private String matnr;

    private String batch;