Quellcode durchsuchen

修改配置文件

larry vor 5 Jahren
Ursprung
Commit
d340ff952a

+ 17 - 0
.gitignore

@@ -1 +1,18 @@
1
+<<<<<<< HEAD
1 2
 /target/
3
+=======
4
+# ---> Java
5
+*.class
6
+
7
+# Mobile Tools for Java (J2ME)
8
+.mtj.tmp/
9
+
10
+# Package Files #
11
+*.jar
12
+*.war
13
+*.ear
14
+
15
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
16
+hs_err_pid*
17
+
18
+>>>>>>> bd0fbe399321923516ff3253d5683d8553f43aaf

+ 8 - 0
LICENSE

@@ -0,0 +1,8 @@
1
+MIT License
2
+Copyright (c) <year> <copyright holders>
3
+
4
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
5
+
6
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
7
+
8
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+ 6 - 0
README.md

@@ -1,4 +1,5 @@
1 1
 <<<<<<< HEAD
2
+<<<<<<< HEAD
2 3
 ## depot-web-yunnan
3 4
 
4 5
 云南项目
@@ -8,3 +9,8 @@
8 9
 
9 10
 云南项目--初始化web前端
10 11
 >>>>>>> ad0adf2cee271cbf9f6d2aaba351644305c3b5bd
12
+=======
13
+# depot-web-neimeng
14
+
15
+初始化web--内蒙古项目
16
+>>>>>>> bd0fbe399321923516ff3253d5683d8553f43aaf

+ 1 - 1
src/main/resources/static/app/auth/views/login.html

@@ -9,7 +9,7 @@
9 9
 		<div class="con">
10 10
 			<form id="login-form" class="smart-form client-form" novalidate="novalidate">
11 11
 				<div class="con-messon">
12
-					<a><img src="../../../styles/img/login/logo_neimeng.png" /></a>
12
+					<a><img src="../../../styles/img/home-1/logo_neimeng.png" /></a>
13 13
 				</div>
14 14
 				<div class="comtain-right">
15 15
 					<div class="comtain-message" style="height:30px;">

BIN
src/main/resources/static/styles/img/login/logo_neimeng.png