Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

chenlu

17 小时以前 a0db8ecfc7f6a560804e94b5834435ce460c00b9

 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderFileService.java

@@ -71,7 +71,7 @@

    public Object updateOrderFileByOrderNumber(MultipartFile file,String name,String orderId,String orderNumber,Float width,Float height) throws IOException {
       //判断是否规定的格式后缀名
        if(!isAllowedFile(name)){
        if(!isAllowedFile(name) || orderNumber == null || orderId == null){
           return null;
       }