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