Merge remote-tracking branch 'origin/master'

bz
1 changed files with 3 additions and 1 deletions
--- a/src/main/java/com/dsic/gj_erp/controller/jcsj/BomUploadController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/BomUploadController.java
@ -79,6 +79,8 @@ 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(".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")){
Author	SHA1	Message	Date
xhj	4a84f0444b	Merge remote-tracking branch 'origin/master'	1 year ago
xhj	21b09e7e0f	bz	1 year ago