Commit 7e5bf6e6 authored by dahai's avatar dahai

Merge remote-tracking branch 'origin/dev' into dev

parents 73b42435 7fe3f10a
...@@ -4,7 +4,7 @@ server: ...@@ -4,7 +4,7 @@ server:
spring: spring:
datasource: datasource:
driver-class-name: oracle.jdbc.driver.OracleDriver driver-class-name: oracle.jdbc.driver.OracleDriver
url: jdbc:oracle:thin:@192.168.10.208:1521:yingxin url: jdbc:oracle:thin:@192.168.1.16:1521:yingxin
username: yingxin username: yingxin
password: yingxin password: yingxin
servlet: servlet:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment