From bd331a582851cffcce54316e677e23760de4f384 Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期一, 24 六月 2019 11:36:49 +0800 Subject: [PATCH] 冲突文件 --- fanli/src/main/java/com/yeshi/fanli/dto/pdd/PDDOrderResult.java | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/dto/pdd/PDDOrderResult.java b/fanli/src/main/java/com/yeshi/fanli/dto/pdd/PDDOrderResult.java index aafd9bd..4ae832d 100644 --- a/fanli/src/main/java/com/yeshi/fanli/dto/pdd/PDDOrderResult.java +++ b/fanli/src/main/java/com/yeshi/fanli/dto/pdd/PDDOrderResult.java @@ -8,14 +8,6 @@ private int totalCount;// 鎬绘暟閲� private List<PDDOrder> orderList;// 鍟嗗搧鍒楄〃 - public PDDOrderResult() { - } - - public PDDOrderResult(int totalCount, List<PDDOrder> orderList) { - this.totalCount = totalCount; - this.orderList = orderList; - } - public int getTotalCount() { return totalCount; } @@ -24,11 +16,20 @@ this.totalCount = totalCount; } - public List<PDDOrder> getGoodsList() { + public List<PDDOrder> getOrderList() { return orderList; } - public void setGoodsList(List<PDDOrder> orderList) { + public void setOrderList(List<PDDOrder> orderList) { this.orderList = orderList; } + + public PDDOrderResult() { + } + + public PDDOrderResult(int totalCount, List<PDDOrder> orderList) { + this.totalCount = totalCount; + this.orderList = orderList; + } + } -- Gitblit v1.8.0