From fcbb4059f11d1e2b320d581bf6f960d9965142c6 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 08 七月 2025 08:58:18 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev

---
 zy-asrs-admin/src/utils/localeUtils.js |   40 ++++++++++++++++++++--------------------
 1 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/zy-asrs-admin/src/utils/localeUtils.js b/zy-asrs-admin/src/utils/localeUtils.js
index fd4236c..f9d2882 100644
--- a/zy-asrs-admin/src/utils/localeUtils.js
+++ b/zy-asrs-admin/src/utils/localeUtils.js
@@ -1,21 +1,21 @@
-import { globalState } from '../config.js'
-import { post } from '@/utils/request.js'
-
-export const formatMessage = (id, defaultMessage) => {
-    const message = globalState.localeData;
-    if(message == null) {
-        return defaultMessage;
-    }
-    if(message[id] == null || message[id] == undefined) {
-        return defaultMessage;
-    }
-    return message[id];
-}
-
-export const loadData = async (locale) => {
-    let resp = await post('/api/language/json',{
-        locale: locale
-    })
-    let result = resp.data;
-    globalState.localeData = result.data;
+import { globalState } from '../config.js'
+import { post } from '@/utils/request.js'
+
+export const formatMessage = (id, defaultMessage) => {
+    const message = globalState.localeData;
+    if(message == null) {
+        return defaultMessage;
+    }
+    if(message[id] == null || message[id] == undefined) {
+        return defaultMessage;
+    }
+    return message[id];
+}
+
+export const loadData = async (locale) => {
+    let resp = await post('/api/language/json',{
+        locale: locale
+    })
+    let result = resp.data;
+    globalState.localeData = result.data;
 }
\ No newline at end of file

--
Gitblit v1.9.1