Merge branch 'master' of

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

Merge branch 'master' of
http://zhangguoping@gitlab.dituhui.com/middle-platform-public/config-repo.git Conflicts: user-dev.yml
章国平
Commit a1a75a12 authored Nov 27, 2020 by 章国平
Showing with 1 additions and 2 deletions
user-dev.yml
--- a/user-dev.yml
+++ b/user-dev.yml
@@ -9,4 +9,4 @@ a:
 spring:
  profiles: prod
 a:
-  b: prod
\ No newline at end of file
+  b: prod