Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into feature_v1.0

tuoheng-service/tuoheng-admin/src/main/resources/logback.xml

@@ -13,7 +13,7 @@
 	<contextName>tuoheng-admin</contextName>
 
 	<!--定义日志变量-->
-	<property name="logging.path" value="/data/java/logs/tuoheng_freeway_admin"/>
+	<property name="logging.path" value="/data/java/logs/tuoheng_freeway"/>
 	<!--日志格式: [时间] [级别] [线程] [行号] [logger信息] - [日志信息]-->
 	<property name="logging.pattern" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%level][%thread][%L] %logger - %msg%n"/>
 	<property name="logging.charset" value="UTF-8"/>