From 97fba4a0e38c0b8455d43d2935aa996676407361 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 08 十二月 2025 16:40:36 +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 |    3 ++-
 1 files changed, 2 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 ebadad0..29f9e6e 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -1333,7 +1333,8 @@
         userPassWord :'User Pass Word',
         glassPrice:'Glass Price',
         glassOptimize:'鐜荤拑浼樺寲',
-        finishedGlassShelf:'鎴愬搧鏂欐灦'
+        finishedGlassShelf:'鎴愬搧鏂欐灦',
+        userLog:'鐧诲綍鏃ュ織'
     },
 
     glassPrice:{

--
Gitblit v1.8.0