20190531 修改配置文件的路径

server/src/main/resources/bootstrap-dev.properties

@@ -33,6 +33,12 @@ turbine.instanceUrlSuffix.11601-PICA-CLOUD-API-WORKSTATION=/api-ws/hystrix.strea
 #logback settings
 logging.level.ROOT=INFO
 logging.path=/opt/tomcat_log/${spring.application.name}
+<<<<<<< HEAD
+=======
+
+
+
+>>>>>>> bb06734555ad825926e6a9b2054f6624fb09ca7a
 
 
 #rabbitmq setting