Merge branch 'dev' of git.dev.yoho.cn:yoho30/yohobuy-union into dev

+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

+disabled=06target
+eclipse.preferences.version=1

@@ -6,7 +6,7 @@ datasources:
       username: yh_test
       password: 9nm0icOwt6bMHjMusIfMLw==
 
-   yoho_logs:
+   yohobuy_logs:
       servers:
         - 192.168.50.69:9980
       username: yh_test

@@ -6,7 +6,7 @@ datasources:
       username: ${jdbc.mysql.yohopassport.username}
       password: ${jdbc.mysql.yohopassport.password}
       
-   yoho_logs:
+   yohobuy_logs:
       servers:
         - ${jdbc.mysql.yohologs.master}
       username: ${jdbc.mysql.yohologs.username}