From 723edfdd07208ec27409d1cffb70b9a4eac69446 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 18 三月 2024 16:13:22 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/northglass-erp/src/lang/en.js |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index e7fa3ae..269dd66 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -23,6 +23,8 @@
         add:'Add',
         delete:'Delete',
         edit:'Edit',
+        cancel:'cancel',
+        restore:'restore',
         selectSame:'Select same',
         sameAfterwards:'Same afterwards',
         clearSelection:'Clear selection',
@@ -102,7 +104,8 @@
             importMaxCheckFailFirst:'Import ',
             importMaxCheckFailMid:' the data can not exceed ',
             importMaxCheckFailLast:' pieces, please import in multiple orders',
-            updateAmountSuccessfully:'Updated amount successfully'
+            updateAmountSuccessfully:'Updated amount successfully',
+            updateOrderState:'Order status update succeeded',
         }
 
     },

--
Gitblit v1.8.0