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

whycq

2024-06-30 f884d266dce2295e75462e931f7fb60eb2c23c80

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

@@ -27,6 +27,8 @@
    // 批次
    private String batch;

    private String locNo;

    public MatDto() {
    }