From 78809560f4315777e770acec0e24cb42e2ca97a7 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 10 七月 2024 08:06:48 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

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

diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index 72377b5..cdc19ab 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -61,6 +61,8 @@
             max255:"鏈�澶氳緭鍏�255涓瓧绗�",
             range99999Dec2:
                 "璇疯緭鍏�0-99999涔嬮棿鐨勬暟瀛楋紝鏈�澶氫繚鐣欎袱浣嶅皬鏁�",
+            range999999Dec2:
+                "璇疯緭鍏�0-999999涔嬮棿鐨勬暟瀛楋紝鏈�澶氫繚鐣欎袱浣嶅皬鏁�",
             greater0:"璇疯緭鍏ュぇ浜�0鐨勬暣鏁�",
             checkoutLose:'鏍¢獙涓嶉�氳繃',
             saveSuccess:'淇濆瓨鎴愬姛',
@@ -393,7 +395,7 @@
         halfProductLabel:'鍗婂搧鏍囩',
         pleaseSelectCustomPrintLabelStyle:'璇烽�夋嫨鑷畾涔夋墦鍗版爣绛炬牱寮�',
         mergePrinting:'鍚堝苟鎵撳嵃',
-        printStatus:'鎵撳嵃鐘舵��',
+        printStatus:'鎵撳嵃娆℃暟',
         labelPrinting2:'鏍囩鎵撳嵃2',
         addAutomatically:'鑷姩濉厖',
         selectFill:'閫変腑濉厖'

--
Gitblit v1.8.0