Merge remote-tracking branch 'origin/master'

Crunchy

2024-07-30 19f2daee178ac2526d78470b5941ad6d0d57963c

 cnas-server/src/main/java/com/yuanchu/mom/dto/DeviceConfigDtoPage.java

@@ -69,4 +69,7 @@

    @ApiModelProperty(value = "检验项目id")
    private Integer structureItemParameterId;

    private String mdbEntrustCode;
    private String mdbSampleCode;
}