Merge remote-tracking branch 'origin/master'

admin

2018-12-26 f4b0bb5dfda8f21409b9eb0b2ee6e436c87475e3

 fanli/src/main/resource/druid.properties

@@ -27,7 +27,7 @@
#druid.password=Yeshi2016@



#外网本地测试

#druid.url=jdbc:mysql://gz-cdb-r13d0yi9.sql.tencentcdb.com:62929/ec_quan_test

#druid.url=jdbc:mysql://gz-cdb-r13d0yi9.sql.tencentcdb.com:62929/ec_quan

#druid.username=root

#druid.password=Yeshi2016@