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

yaowanxin

2025-08-04 b290cb0452d5731694e6ffe46e8f6eb5fec645a6

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

@@ -25,4 +25,12 @@

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