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

maven

3 天以前 fe2d7c404c69700404814e18a70d5e606916486b

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