From 01468f977925eb5926b843fd0cd74fee42bdc9a7 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 26 十二月 2023 08:45:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion

---
 src/main/webapp/views/index.html |    2 +-
 src/main/webapp/views/login.html |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index aa47f08..828897e 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <meta charset="utf-8">
-  <title> - 鑷姩鍖栫珛浣撲粨搴� - AS / RS</title>
+  <title>绫冲- 鑷姩鍖栫珛浣撲粨搴� - AS / RS</title>
   <meta name="renderer" content="webkit">
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
diff --git a/src/main/webapp/views/login.html b/src/main/webapp/views/login.html
index 9112ed0..a36dd6e 100644
--- a/src/main/webapp/views/login.html
+++ b/src/main/webapp/views/login.html
@@ -68,7 +68,7 @@
       <div class="login-contain">
         <div class="login-box">
           <img src="../static/image/logo.png" alt="" style="width: 80%">
-          <span class="login100-form-title p-t-20 p-b-45">楂橀�熺墿娴�</span>
+          <span class="login100-form-title p-t-20 p-b-45">绫冲鏅鸿兘</span>
           <span class="login100-form-title p-t-20 p-b-45" style="margin: 15px 0;color: #868686;font-size: 24px">WMS</span>
           <div class="wrap-input100 validate-input m-b-10" data-validate="璇疯緭鍏ョ敤鎴峰悕">
             <input id="username" class="input100" type="text" name="username" placeholder="username" autocomplete="off">

--
Gitblit v1.9.1