Merge remote-tracking branch 'origin/master'

zss

2024-07-23 dd301742784e570ec01098907f56e5c9c19b5a99

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

@@ -128,10 +128,10 @@
    @ApiModelProperty("存储地址")
    private String storageUrl;

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

    @ApiModelProperty("是否为数采设备")
    @TableField(exist = false)
    private Boolean isItADataAcquisitionDevice;

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