Merge branch 'dev' into test

src/views/material/BOMmanage/components/workingProcedure.vue

@@ -1415,7 +1415,7 @@ export default {
       filePageAPI({
           pageNum: 1,
           size: 999,
-          directoryId: '1',
+          directoryId: null,
           lcyStatus: 1,
           fileType: 0,
           ids:fileId