Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

zhou zhou

昨天 10776dd6f7f9ef9e47419427fcb1b692ed73d54d

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderLogServiceImpl.java

@@ -70,7 +70,7 @@
                BeanUtils.copyProperties(itemLog, item);
                item.setId(itemLog.getAsnItemId())
                        .setOrderId(order.getId())
                        .setMatnrId(Long.parseLong(itemLog.getMatnrId()))
                        .setMatnrId(itemLog.getMatnrId())
                        .setDeleted(0);
                orderItems.add(item);
            }