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 | 6 +++---
1 files changed, 3 insertions(+), 3 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 0f143a9..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
@@ -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;
}
--
Gitblit v1.9.3