Merge branch 'master' into 'dev-init-20180808'

项目路径问题调整 See merge request !1

Merge branch 'master' into 'dev-init-20180808'
项目路径问题调整 See merge request !1
62f6017e · 陈哲浩 · feaab709 · 61230df8 · 62f6017e · 62f6017e
--- a/server/src/main/java/com/pica/cloud/wechat/yunqueyilian.server/App.java
+++ b/server/src/main/java/com/pica/cloud/wechat/yunqueyilian.server/App.java
--- a/server/src/main/java/com/pica/cloud/wechat/yunqueyilian.server/client/IConfigServiceClient.java
+++ b/server/src/main/java/com/pica/cloud/wechat/yunqueyilian.server/client/IConfigServiceClient.java
--- a/server/src/main/java/com/pica/cloud/wechat/yunqueyilian.server/client/impl/ConfigServerClient.java
+++ b/server/src/main/java/com/pica/cloud/wechat/yunqueyilian.server/client/impl/ConfigServerClient.java
--- a/server/src/main/java/com/pica/cloud/wechat/yunqueyilian.server/configuration/BeanConfiguration.java
+++ b/server/src/main/java/com/pica/cloud/wechat/yunqueyilian.server/configuration/BeanConfiguration.java
--- a/server/src/main/java/com/pica/cloud/wechat/yunqueyilian.server/configuration/PropertiesConfiguration.java
+++ b/server/src/main/java/com/pica/cloud/wechat/yunqueyilian.server/configuration/PropertiesConfiguration.java
--- a/server/src/main/java/com/pica/cloud/wechat/yunqueyilian.server/controller/DemoController.java
+++ b/server/src/main/java/com/pica/cloud/wechat/yunqueyilian.server/controller/DemoController.java