Merge branch 'master' of

http://zhangguoping@gitlab.dituhui.com/middle-platform-public/config-repo.git

Conflicts:
	user-dev.yml

user-dev.yml

@@ -9,4 +9,4 @@ a:
 spring:
 spring:
   profiles: prod
   profiles: prod
 a:
 a:
-  b: prod
+  b: prod
\ No newline at end of file