From 3d5198eca9b5a6b7114f48936b0e46068236be80 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 04 九月 2024 01:36:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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..df50bda 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;
--
Gitblit v1.8.0