From 5e88359d7210039a6b1525bd5ffc20f24f2b5e01 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 08 五月 2019 16:13:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master_develop

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/count/ExtractServiceCountImpl.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/ExtractServiceCountImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/ExtractServiceCountImpl.java
index 85d1af1..239c033 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/ExtractServiceCountImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/ExtractServiceCountImpl.java
@@ -1,7 +1,6 @@
 package com.yeshi.fanli.service.impl.count;
 
 import java.math.BigDecimal;
-import java.util.List;
 import java.util.Map;
 
 import javax.annotation.Resource;

--
Gitblit v1.8.0