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

zss

2025-04-18 ec1f20c31d64ddbc5242c3942902bc5233a8a140

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