Merge remote-tracking branch 'origin/master'

src/main/java/com/dsic/gj_erp/controller/jcsj/BomUploadController.java

@@ -79,7 +79,9 @@ public class BomUploadController {
                 String url= com.dsic.gj_erp.util.FileUtil.handlerUpload(file,"/"+dcCh+"/"+pl+"/QG"+"/"+s);
 
                 bomMapper.insertFile(url,"");
-            }else if (file.getOriginalFilename().contains(".pdf")){
+            }else if (file.getOriginalFilename().contains(".xlsx")|| file.getOriginalFilename().contains(".cvs")|| file.getOriginalFilename().contains(".xls") ){
+                String url= com.dsic.gj_erp.util.FileUtil.handlerUpload(file,"/"+dcCh+"/"+pl+"/其他");
+            } else if (file.getOriginalFilename().contains(".pdf")){
 
 
             String url= com.dsic.gj_erp.util.FileUtil.handlerUpload(file,"/"+dcCh+"/"+pl+"/PDF");