Merge branch 'master' into cnas

zss

2024-12-06 a016e3f59d1b2227cd22aeb82090b82d487c8235

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

@@ -24,4 +24,13 @@

    @ApiModelProperty("设备IP")
    private String ip;

    @ApiModelProperty("数采-委托字段")
    private String entrustCode;

    @ApiModelProperty("数采-样品字段")
    private String sampleCode;

    @ApiModelProperty("数采-db，mdb文件名称")
    private String dbFileName;
}