Merge branch 'master-invoice-modular' into dev

816c5d92 · jiaorz · a45d589c · c192d1c0 · 816c5d92
Commit 816c5d92 authored Jan 08, 2020 by jiaorz
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

OrderInvoiceBiz.java ...ain/java/com/xxfc/platform/order/biz/OrderInvoiceBiz.java +3 -1

No files found.
--- a/xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderInvoiceBiz.java
+++ b/xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderInvoiceBiz.java
@@ -156,7 +156,9 @@ public class OrderInvoiceBiz extends BaseBiz<OrderInvoiceMapper, OrderInvoice> {
 				}
 			}
 		}
-		return ObjectRestResponse.succ(set);
+		List<OrderInvoice> list = Lists.newArrayList();
+		list.addAll(set);
+		return ObjectRestResponse.succ(list);
 	}

 	/**