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

gongchunyi

2 天以前 a1e19c7466cce45b5bb360e38ab7c7c1753986f2

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

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