From 81ba6f3ea498c43010f47c7ed6d6c0f121bb1f09 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 24 八月 2024 14:38:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-common/src/main/java/enumeration/ErrorType.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ycl-common/src/main/java/enumeration/ErrorType.java b/ycl-common/src/main/java/enumeration/ErrorType.java
index a1500f6..91b3cf1 100644
--- a/ycl-common/src/main/java/enumeration/ErrorType.java
+++ b/ycl-common/src/main/java/enumeration/ErrorType.java
@@ -15,7 +15,6 @@
DEVICE_OFFLINE("DEVICEOFFLINE", "璁惧绂荤嚎"),
VIDEO_LOSS("VIDEOMISS", "褰曞儚缂哄け"),
VIDEO_NONE("NOVIDEO", "鏃犲綍鍍�"),
- PIC_URLABNORMAL("PICURLABNORMAL","鍥剧墖璁块棶寮傚父"),
POINT_INFO_ERROR("POINTINFOERRO", "鐐逛綅淇℃伅閿欒"),
POINT_INFO_MISS("POINTINFOMISS", "鐐逛綅淇℃伅涓嶅叏"),
SIGNAL_LOSS("SIGNALMISS", "淇″彿缂哄け"),
@@ -28,9 +27,10 @@
UNKNOWN("UNKNOWN", "鏈煡"),
CLOCK_SKEW("CLOCKSKEW", "鏃堕挓鍋忓樊"),
OSD_ERROR("OSD", "osd寮傚父"),
+ PIC_URLABNORMAL("PICURLABNORMAL","鍥剧墖璁块棶寮傚父"),
MONITOR_UNQUALIFY("MONITORUNQUALIFY", "涓�鏈轰竴妗ｄ笉鍚堟牸"),
- VIDEO_ORPIC_UNNORMAL("VIDEOORPICUNNORMAL", "瑙嗛鎷夋祦銆佸浘鐗囪幏鍙栧紓甯�"),
PIC_UNUSEFUL("PICUNUSEFUL", "澶у浘涓嶅彲鐢�"),
+ VIDEO_ORPIC_UNNORMAL("VIDEOORPICUNNORMAL", "瑙嗛鎷夋祦銆佸浘鐗囪幏鍙栧紓甯�"),
;
private String value;
--
Gitblit v1.8.0