From 68a32aa05a22070c048d67ab056f40be86222450 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 04 九月 2024 01:39:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 806c08f..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
@@ -23,6 +23,10 @@
private String deviceNo;
/**
+ * 鎽勫儚鏈哄搧鐗�
+ */
+ private Integer deviceBrand;
+ /**
* 璁惧绫诲瀷
*/
private String deviceType;
@@ -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