Merge remote-tracking branch 'origin/master'

# Conflicts: # pom.xml # src/main/java/cn/cloudowr/dict/Config.java
2018-03-01 17:34:53 +08:00 · 2018-03-01 17:34:53 +08:00 · f11fdd4290
parent baaa866505 a217fe7dad
commit f11fdd4290
1 changed files with 6 additions and 0 deletions
--- a/src/main/resources/config.properties
+++ b/src/main/resources/config.properties
@ -0,0 +1,6 @@
 username=root
 database=admin
 password=CoWR1111
 host=120.24.5.249
 port=3717
 dabaseName=dict