From 197acf666976849d9d51f0c5f78c7672b2e63a07 Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周日, 24 11月 2024 14:38:34 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine

---
 CC/iWareCC_ASRS/Common/SystemWarningMsg.cs |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs b/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs
index 91d97bc..0387ee2 100644
--- a/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs
+++ b/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs
@@ -63,7 +63,7 @@
         /// <summary>
         /// RGV浠诲姟瀹屾垚纭鐨勮鍛婃秷鎭�
         /// </summary>
-        public static string _lbl_Alert_RgvReleaseFinish = string.Empty;
+        public static string _lbl_Alert_DataProcess_RobotBuffer_ModeChange = string.Empty;
 
         /// <summary>
         /// RGV浠诲姟瀹屾垚纭鐨勮鍛婃秷鎭紙琛ュ伩锛�
@@ -118,7 +118,10 @@
         /// 鑷姩缁勭洏浠诲姟 鐨勮鍛婃秷鎭�
         /// </summary>
         public static string _lbl_alert_DataProcess_BZ39 = string.Empty;
-
+        /// <summary>
+        /// 鑷姩鐮佹澘浠诲姟 鐨勮鍛婃秷鎭�
+        /// </summary>
+        public static string _lbl_alert_DataProcess_BZ12 = string.Empty;
 
         /// <summary>
         /// 鑷姩缁勭洏浠诲姟涓嬪彂 鐨勮鍛婃秷鎭�

--
Gitblit v1.9.3