Merge branch 'dev' into pre-production

# Conflicts:
#	blade-service/logpm-basic/src/main/resources/application.yml
#	blade-service/logpm-basicdata/src/main/resources/application.yml
#	blade-service/logpm-distribution/src/main/resources/application.yml
#	blade-service/logpm-factory/src/main/resources/application.yml
#	blade-service/logpm-warehouse/src/main/resources/application.yml

blade-biz-common/src/main/java/org/springblade/common/constant/CommonConstant.java

@@ -53,7 +53,7 @@ public interface CommonConstant {
 	/**
 	 * 默认缓存文件地址
 	 */
-	String  SYSTEMFILEPATH ="D:/logpm_temp_file/";
+	String  SYSTEMFILEPATH ="/home/java_works/logpm_temp_file/";
 
 
 

blade-service/logpm-distribution/pom.xml

@@ -74,6 +74,12 @@
             <scope>compile</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-scope-api</artifactId>
+            <version>${bladex.project.version}</version>
+        </dependency>
+
 
 
     </dependencies>