From 4d9364da736f322cfeeec2815e83f2a3f6534223 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 30 七月 2024 20:04:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 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 f339927..7c52e48 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
@@ -119,24 +119,25 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ApiModelProperty(value = "IP")
- private String ip;
+ @ApiModelProperty("鏁伴噰-鏂囦欢鍚庣紑")
+ private String fileType;
- @ApiModelProperty(value = "閲囬泦鍦板潃")
+ @ApiModelProperty("鏁伴噰-閲囬泦鍦板潃")
private String collectUrl;
- @ApiModelProperty(value = "瀛樺偍鍦板潃")
+ @ApiModelProperty("鏁伴噰-瀛樺偍鍦板潃")
private String storageUrl;
- @ApiModelProperty(value = "鍙傜収")
- private String refer;
+ @ApiModelProperty("鏁伴噰-璁惧IP")
+ private String ip;
- @ApiModelProperty(value = "X")
- private String x;
+ @ApiModelProperty("鏁伴噰-鏄惁涓烘暟閲囪澶�")
+ @TableField(exist = false)
+ private Boolean isItADataAcquisitionDevice;
- @ApiModelProperty(value = "Y")
- private String y;
+ @ApiModelProperty("鏁伴噰-濮旀墭瀛楁")
+ private String mdbEntrustCode;
- @ApiModelProperty(value = "鍏紡")
- private String formula;
+ @ApiModelProperty("鏁伴噰-鏍峰搧瀛楁")
+ private String mdbSampleCode;
}
--
Gitblit v1.9.3