From 5752bbec04c0f047c229a6a1ec2df7f781604aaa Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期四, 29 二月 2024 09:49:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 jcdm-ui/src/views/login.vue |    2 +-
 jcdm-ui/.env.development    |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jcdm-ui/.env.development b/jcdm-ui/.env.development
index d9e93d1..60936ac 100644
--- a/jcdm-ui/.env.development
+++ b/jcdm-ui/.env.development
@@ -1,10 +1,10 @@
 # 椤甸潰鏍囬
-VUE_APP_TITLE = 姹熷MES绯荤粺
+VUE_APP_TITLE = 姹熷iMES绯荤粺
 
 # 寮�鍙戠幆澧冮厤缃�
 ENV = 'development'
 
-# 姹熷MES绯荤粺/寮�鍙戠幆澧�
+# 姹熷iMES绯荤粺/寮�鍙戠幆澧�
 VUE_APP_BASE_API = '/dev-api'
 
 # 璺敱鎳掑姞杞�
diff --git a/jcdm-ui/src/views/login.vue b/jcdm-ui/src/views/login.vue
index bb9ea3c..912a431 100644
--- a/jcdm-ui/src/views/login.vue
+++ b/jcdm-ui/src/views/login.vue
@@ -5,7 +5,7 @@
     </div>
     <div class="login-right">
       <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-        <h2 class="title">姹熷MES绯荤粺</h2>
+        <h2 class="title">姹熷iMES绯荤粺</h2>
         <el-form-item prop="username">
           <el-input
             v-model="loginForm.username"

--
Gitblit v1.9.3