From c7f492c5accca21bdf149148a5be6503552139f1 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 03 九月 2024 21:55:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 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..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
@@ -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;
 

--
Gitblit v1.8.0