Merge branch 'dev' into dev_dz

zhuo

2025-03-15 500b831eb1153e9ba04fbffefa8fdfdfa080316c

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