初始化system 天津项目

.gitignore

@@ -1,6 +1,9 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 /target/
 =======
+=======
+>>>>>>> 3e349fca8e783c1333308aefe20ae9516eb3eda0
 # ---> Java
 *.class
 
@@ -15,4 +18,7 @@
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
+<<<<<<< HEAD
 >>>>>>> 5911ff09caeabdbf11316a9f2fe210b114841c91
+=======
+>>>>>>> 3e349fca8e783c1333308aefe20ae9516eb3eda0

README.md

@@ -1,3 +1,7 @@
 # depot-system-tianjin
 
-系统管理
+<<<<<<< HEAD
+系统管理
+=======
+初始化天津项目--system
+>>>>>>> 3e349fca8e783c1333308aefe20ae9516eb3eda0

src/main/resources/application.properties

@@ -10,7 +10,7 @@ spring.datasource.driverClassName=com.gbasedbt.jdbc.IfxDriver
 mybatis.config-location=classpath:mybatis/mybatis-config.xml
 
 
-eureka.client.serviceUrl.defaultZone=http://172.16.0.4:9811/eureka/
+eureka.client.serviceUrl.defaultZone=http://172.16.0.4:9811/eureka/-
 eureka.instance.prefer-ip-address=true
 
 # 每隔10s发送一次心跳(默认30s)