Merge remote-tracking branch 'origin/dev_New' into dev_New

liyong

昨天 7cc6419a2419408f6578f30b3396c99bc83605e1

 src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java

@@ -72,7 +72,7 @@
        byId.setExpressCompany(req.getExpressCompany());
        byId.setStatus("已发货");
        byId.setShippingCarNumber(req.getShippingCarNumber());
        boolean update = this.updateById(req);
        boolean update = this.updateById(byId);
        // 迁移文件
        if(CollectionUtils.isNotEmpty(req.getTempFileIds())){
            tempFileService.migrateTempFilesToFormal(req.getId(), req.getTempFileIds(), FileNameType.SHIP.getValue());