From bd8213ddfe04f41b7ad0f4c6377afbe39a44b4af Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 18 一月 2019 15:54:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java
index 85396a7..63fc1fa 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java
@@ -1,10 +1,6 @@
package com.yeshi.fanli.service.impl.order;
import java.io.Serializable;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
@@ -14,7 +10,6 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.yeshi.utils.DateUtil;
import org.yeshi.utils.NumberUtil;
import com.yeshi.fanli.dao.mybatis.order.LostOrderMapper;
@@ -294,7 +289,6 @@
@Override
public List<Map<String, Object>> countAppealMoney( Integer dateType, String year, String startTime,
String endTime) throws Exception {
-
return lostOrderMapper.countAppealMoney(dateType, year, startTime, endTime);
}
--
Gitblit v1.8.0