From 0c2b1e149c6c0d9d9ec78bf4f871b3cea2cbfadc Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 04 九月 2024 04:34:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java
index 83a1247..74a0033 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java
@@ -3,18 +3,18 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.domain.result.BaseResult;
import lombok.Data;
-import org.springframework.data.mongodb.core.annotation.Collation;
+import org.springframework.data.mongodb.core.mapping.Document;
import java.util.Date;
/**
- * python鑾峰彇osd鏁版嵁
+ * 鑾峰彇osd鏁版嵁
*
* @author锛歺p
* @date锛�2024/8/8 19:35
*/
@Data
-@Collation("osd_check_result")
+@Document(collection = "osd_check_result")
public class OsdCheckResult extends BaseResult {
/**
@@ -22,6 +22,10 @@
*/
private String deviceNo;
+ /**
+ * 鎽勫儚鏈哄搧鐗�
+ */
+ private Integer deviceBrand;
/**
* 璁惧绫诲瀷
*/
@@ -64,7 +68,7 @@
private String osdPart;
/**
- * osd 宸︿笅瑙�
+ * osd宸︿笅瑙�
*/
private String osdLB;
@@ -74,7 +78,7 @@
private Integer osdTimeCorrect;
/**
- * osd閫氶亾鍚嶆槸鍚︽纭�
+ * osd閫氶亾鍚嶆槸鍚︽纭� 1姝ｇ‘ 0鏈煡 -1閿�
*/
private Integer osdNameCorrect;
/**
--
Gitblit v1.8.0