From dd301742784e570ec01098907f56e5c9c19b5a99 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 23 七月 2024 17:26:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
index a7ee499..909c79a 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
@@ -127,4 +127,11 @@
 
     @ApiModelProperty("瀛樺偍鍦板潃")
     private String storageUrl;
+
+    @ApiModelProperty("璁惧IP")
+    private String ip;
+
+    @ApiModelProperty("鏄惁涓烘暟閲囪澶�")
+    @TableField(exist = false)
+    private Boolean isItADataAcquisitionDevice;
 }

--
Gitblit v1.9.3