From d4588f4e43336b26b356b869c29d0c76390167d5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 四月 2020 10:22:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/DailyCountUserServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/DailyCountUserServiceImpl.java
index 34434e2..8f7f5e0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/DailyCountUserServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/DailyCountUserServiceImpl.java
@@ -11,7 +11,6 @@
 import org.yeshi.utils.DateUtil;
 
 import com.yeshi.fanli.dao.user.count.DailyCountUserDao;
-import com.yeshi.fanli.dto.order.CountOrderDTO;
 import com.yeshi.fanli.entity.admin.count.DailyCountUser;
 import com.yeshi.fanli.entity.admin.count.DailyCountUser.DailyCountUserEnum;
 import com.yeshi.fanli.entity.bus.user.Extract;
@@ -119,7 +118,8 @@
 	 * @param typeEnum
 	 * @throws Exception
 	 */
-	private void initData(DailyCountUserEnum typeEnum) throws Exception {
+	@Override
+	public void initData(DailyCountUserEnum typeEnum) throws Exception {
 		Date lastDate = null;
 		DailyCountUser lastRecord = dailyCountUserDao.getMaxDate(typeEnum);
 		if (lastRecord != null) {

--
Gitblit v1.8.0