Merge branch 'master' of http://47.112.200.206:3000/shenhao/sys

src/main/resources/application.properties

@@ -2,7 +2,7 @@ spring.application.name=ssj-sys-web
 server.port=8080
 logger.level=info
 
-spring.profiles.active=common,common-dev
+spring.profiles.active=common,@activatedProperties@
 
 spring.mvc.static-path-pattern=/static/**