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

gongchunyi

2 天以前 6a939851b9561fea92ec29c59fa9e47ab9467ff7

 cnas-device/src/main/java/com/ruoyi/device/pojo/Device.java

@@ -140,4 +140,6 @@
    //数据库密码
    @ApiModelProperty("数据库密码")
    private String dbPassword;
    @ApiModelProperty("数据库表")
    private String dbTable;
}