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/util/pinduoduo/PinDuoDuoApiUtil.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/pinduoduo/PinDuoDuoApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/pinduoduo/PinDuoDuoApiUtil.java
index 27d076a..ea8ce84 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/pinduoduo/PinDuoDuoApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/pinduoduo/PinDuoDuoApiUtil.java
@@ -138,6 +138,17 @@
System.out.println(result);
}
+ /**
+ * 鑾峰彇璁㈠崟
+ *
+ * @param page
+ * -椤电爜
+ * @param pageSize-姣忛〉鏁伴噺
+ * @param startTime-寮�濮嬫椂闂�
+ * @param endTime-缁撴潫鏃堕棿
+ * 涓庡紑濮嬫椂闂翠笉寰楀ぇ浜�24灏忔椂
+ * @return
+ */
public static PDDOrderResult getOrders(int page, int pageSize, long startTime, long endTime) {
Map<String, String> map = new HashMap<>();
map.put("type", "pdd.ddk.order.list.increment.get");
--
Gitblit v1.8.0