From b9fa1c266e2d51388a757cf361680d82f6edfbea Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 08 十二月 2025 15:49:59 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/northglass-erp/src/lang/ru.js |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/lang/ru.js b/north-glass-erp/northglass-erp/src/lang/ru.js
index 94afeba..0acd315 100644
--- a/north-glass-erp/northglass-erp/src/lang/ru.js
+++ b/north-glass-erp/northglass-erp/src/lang/ru.js
@@ -1334,7 +1334,8 @@
         userPassWord :'袠蟹屑械薪懈褌褜 锌邪褉芯谢褜',
         glassPrice:'笑械薪邪 褋褌械泻谢邪.',
         glassOptimize:'鐜荤拑浼樺寲',
-        finishedGlassShelf:'鎴愬搧鏂欐灦'
+        finishedGlassShelf:'鎴愬搧鏂欐灦',
+        userLog:'鐧诲綍鏃ュ織'
     },
 
     glassPrice:{

--
Gitblit v1.8.0