From c8df02a7b07086e17bacda6cdc015d76ac1f82fe Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 04 九月 2024 17:16:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/result/OSDResult.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/OSDResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/OSDResult.java
index f2427e0..0360f02 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/OSDResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/OSDResult.java
@@ -35,13 +35,12 @@
* 閫氶亾鍚嶏紙monitor鐨勮澶囧悕锛�
*/
private String name;
- /**
- * OSD4銆�5閮藉彲鑳戒负鍚嶅瓧锛屼袱鏉′竴璧锋瘮瀵�
- */
- private String name2;
+
//osd宸︿笅
/**
* 鍥恒�佹灙銆佽矾銆佽タ鍖�
*/
private String OSD4;
+
+ private Integer deviceBrand;
}
--
Gitblit v1.8.0