From b9d6c39b0bc0b65cbd943dfaedadb6a343bf799e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 10 八月 2024 15:54:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 7c52e48..2237bc8 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
@@ -136,8 +136,11 @@
private Boolean isItADataAcquisitionDevice;
@ApiModelProperty("鏁伴噰-濮旀墭瀛楁")
- private String mdbEntrustCode;
+ private String entrustCode;
@ApiModelProperty("鏁伴噰-鏍峰搧瀛楁")
- private String mdbSampleCode;
+ private String sampleCode;
+
+ @ApiModelProperty("鏁伴噰-db锛宮db鏂囦欢鍚嶇О")
+ private String dbFileName;
}
--
Gitblit v1.9.3