From 1d43e01376590a26a8e976a398b4744b6906cab4 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 02 九月 2024 18:16:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-pojo/src/main/java/com/ycl/platform/domain/result/OSDResult.java |    5 +----
 1 files changed, 1 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..ade1021 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,10 +35,7 @@
      * 閫氶亾鍚嶏紙monitor鐨勮澶囧悕锛�
      */
     private String name;
-    /**
-     * OSD4銆�5閮藉彲鑳戒负鍚嶅瓧锛屼袱鏉′竴璧锋瘮瀵�
-     */
-    private String name2;
+
     //osd宸︿笅
     /**
      * 鍥恒�佹灙銆佽矾銆佽タ鍖�

--
Gitblit v1.8.0