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

zss

2025-04-17 e9bf5a0070b5fbdf9afd4475adbf51e46f579040

 cnas-device/src/main/java/com/ruoyi/device/dto/DataConfigDto.java

@@ -33,4 +33,7 @@

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

    @ApiModelProperty("设备ID")
    private Integer deviceId;
}