Merge remote-tracking branch 'origin/master'

zss

2024-07-22 c0fd46ed9c7ddf7a3ea4e6a972474e9a62c68a1a

 cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java

@@ -131,4 +131,7 @@
    @ApiModelProperty("是否为数采设备")
    @TableField(exist = false)
    private Boolean isItADataAcquisitionDevice;

    @ApiModelProperty("设备IP")
    private String ip;
}