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

zjj

2024-11-08 b6a095a76848ffd15922cc4af7f14594fc5bf85d

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

@@ -40,6 +40,12 @@
        this.batch = batch;
        this.anfme = anfme;
    }
    public DetlDto(String matnr, String batch, Double anfme,String mark) {
        this.matnr = matnr;
        this.batch = batch;
        this.anfme = anfme;
        this.mark = mark;
    }

    public DetlDto(String orderNo, String matnr, String batch, Double anfme) {
        this.orderNo = orderNo;