Merge branch 'feature/cpy_splite' into test

# Conflicts:
#	order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java

@@ -196,7 +196,7 @@ public class InvoiceServiceImpl implements InvoiceService {
                 List<PageOrderItemInfo> cpyOrderItemInfo = new ArrayList<PageOrderItemInfo>();
                 for (OrderItemInfo cpyOrderItem : cpyOrderItems) {
                     PageOrderItemInfo pageOrderItemInfo = new PageOrderItemInfo();
-                    BeanUtils.copyProperties(cpyOrderItem,cpyOrderItemInfo);
+                    BeanUtils.copyProperties(cpyOrderItem,pageOrderItemInfo);
                     cpyOrderItemInfo.add(pageOrderItemInfo);
                 }
                 cpyPageCommonOrderInfo.setOrderInfo(cpyPageOrderInfo);
@@ -211,7 +211,7 @@ public class InvoiceServiceImpl implements InvoiceService {
                 List<PageOrderItemInfo> nocpyOrderItemInfo = new ArrayList<PageOrderItemInfo>();
                 for (OrderItemInfo nocpyOrderItem : nocpyOrderItems) {
                     PageOrderItemInfo pageOrderItemInfo = new PageOrderItemInfo();
-                    BeanUtils.copyProperties(nocpyOrderItem,nocpyOrderItemInfo);
+                    BeanUtils.copyProperties(nocpyOrderItem,pageOrderItemInfo);
                     nocpyOrderItemInfo.add(pageOrderItemInfo);
                 }
                 nocpyPageCommonOrderInfo.setOrderInfo(nocpyPageOrderInfo);