Merge branch 'master' of http://114.215.101.231:8099/kgy/synthesize_energy_project

wwmin
synthesize_energy_api/src/main/resources/application.yml
--- a/synthesize_energy_api/src/main/resources/application.yml
查看文件 @544f61a
+++ b/synthesize_energy_api/src/main/resources/application.yml
查看文件 @544f61a
@@ -3,6 +3,6 @@ spring:
     #开发时使用下面注释
 #    active: dev
     #    打包时使用下面注释
-     active: prod
+     active: dev2