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

Junjie

2024-06-12 8a8faba0f55512a2c18c4fe719a1bb0c4f6a86c9

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

@@ -73,4 +73,13 @@
        this.count = count;
        this.total = total;
    }
    public MatDto(String matNo, String maknx, Double count,Double total,String specs,String containerCode,String orderNo) {
        this.containerCode = containerCode;
        this.specs = specs;
        this.matNo = matNo;
        this.maknx = maknx;
        this.count = count;
        this.total = total;
        this.orderNo = orderNo;
    }
}