From 82bd97c5a0e05c936f62acf28ac4969b351b6d59 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 03 九月 2025 10:15:10 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/northglass-erp/src/lang/en.js |    4 +++-
 1 files changed, 3 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 25c745e..6a0e29d 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -382,7 +382,9 @@
         yMargin:'Y-axis margin',
         location:'Trademark position',
         sort:'鐜荤拑鍙嶅集',
-        archRise:'鎷遍珮'
+        archRise:'鎷遍珮',
+        qr1Local:'浜岀淮鐮�1浣嶇疆',
+        qr2Local:'浜岀淮鐮�2浣嶇疆',
 
     },
 

--
Gitblit v1.8.0