From e97b71caed03d1f1aa3ae21b1ea0deac4dd9ffe0 Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期五, 16 八月 2019 14:28:38 +0800 Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div --- fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java index bcc9639..bf71268 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java @@ -114,7 +114,7 @@ * @return */ public Map<String, Object> countBonusOrderMoneyAndNumber(Long uid, Integer type, Integer day, String startTime, - String endTime); + String endTime, Integer source); /** * 鏍规嵁鏉′欢缁熻 @@ -223,8 +223,6 @@ public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState, String startTime, String endTime, Integer source) throws CommonOrderException; - - /** * 鏌ヨ璁㈠崟 * -- Gitblit v1.8.0