Merge branch 'dev_ztns' into dev_ywx_ztns

zouyu

2025-07-21 6fb742d463ecac5e7d4934d7248a40979edc3626

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

@@ -25,4 +25,10 @@

    @ApiModelProperty(value = "采集的检验项id")
    private List<Integer> itemIds;
    //数据库用户名
    @ApiModelProperty(value = "数据库用户名")
    private String dbUserName;
    //数据库密码
    @ApiModelProperty(value = "数据库密码")
    private String dbPassword;
}