Merge branch 'main' of http://10.10.14.176:3000/huanghai/ccZhiChengTouPiao

# Conflicts:
#	src/main/resource/undertow.properties
#	target/classes/undertow.properties

WebRoot/html/login.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="renderer" content="webkit|ie-comp|ie-stand">
     <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <title>东师理想基础数据管理系统</title>
+    <title>长春市教育技术装备与信息中心职称评审系统</title>
     <meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no"/>
     <!-- 手机端禁止缩放 -->
     <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport"/>
@@ -30,7 +30,7 @@
         </div>
         <div class="right-content clearfix">
             <div class="content-name">
-                <p style="font-size: 20px;font-weight: bolder">东师理想基础数据管理系统</p>
+                <p style="font-size: 20px;font-weight: bolder">长春市教育技术装备与信息中心职称评审系统</p>
             </div>
             <form action="" method="post">
                 <div class="user-name">

src/main/resource/undertow.properties

@@ -2,7 +2,7 @@
 undertow.devMode=true
 undertow.port=9000
 undertow.host=0.0.0.0
-#undertow.resourcePath =/usr/local/tomcat8/webapps/FengHuang,classpath:static
+#undertow.resourcePath =/usr/local/tomcat8/webapps/ccZhiChengTouPiao,classpath:static
 undertow.resourcePath =D:/dsWork/ccZhiChengTouPiao/WebRoot,classpath:static
 
 # 目录名称

target/classes/undertow.properties

@@ -2,7 +2,11 @@
 undertow.devMode=true
 undertow.port=9000
 undertow.host=0.0.0.0
+<<<<<<< HEAD
 #undertow.resourcePath =/usr/local/tomcat8/webapps/FengHuang,classpath:static
+=======
+#undertow.resourcePath =/usr/local/tomcat8/webapps/ccZhiChengTouPiao,classpath:static
+>>>>>>> 654e30d6091b9be653da34e04b7315edce49b3df
 undertow.resourcePath =D:/dsWork/ccZhiChengTouPiao/WebRoot,classpath:static
 
 # 目录名称