Merge remote-tracking branch 'origin/master'

# Conflicts:
#	api-admin/src/main/resources/logback-spring.xml

api-admin/src/main/resources/application-test.properties

@@ -21,11 +21,11 @@ spring.servlet.multipart.max-request-size=104857600
 server.connectionTimeout=180000
 #logging.level.com.glxp.sale.admin.dao=debug
 # \u8F93\u51FA\u65E5\u5FD7\u5230\u9879\u76EE\u6839\u76EE\u5F55\u4E0B\u7684springboot.log\u6587\u4EF6\u4E2D // \u914D\u7F6E logback-spring.xml\u65F6 \u6B64\u65E5\u5FD7\u8F93\u51FA\u65B9\u5F0F\u4F1A\u88AB\u8986\u76D6\u3002
-logging.file=D:/1s/udiwms/udiwms.log
+logging.file=/1s/udiwms/udiwms.log
 #logging.file=/www/glxpdata/spsyc/
-file_path=D:/share/udisps/
+file_path=/share/udisps/
 #file_path=/share/order/sync
-back_file_path=D:/share/udisps/back/
+back_file_path=/share/udisps/back/
 #back_file_path=/share/order/sync_back
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8