Merge branch 'dev_ztns' into dev_ywx_ztns

zouyu

2025-07-21 6fb742d463ecac5e7d4934d7248a40979edc3626

 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;
}