From fed1f885b03a5b4b7c62d44320c3ff2068ca02e6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 03 Feb 2021 11:01:24 +0800
Subject: [PATCH] confict
---
zq-erp/src/main/java/com/matrix/system/hiveErp/action/DataAnalysisCustomer.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hiveErp/action/DataAnalysisCustomer.java b/zq-erp/src/main/java/com/matrix/system/hiveErp/action/DataAnalysisCustomer.java
index 8c1a271..8b00027 100644
--- a/zq-erp/src/main/java/com/matrix/system/hiveErp/action/DataAnalysisCustomer.java
+++ b/zq-erp/src/main/java/com/matrix/system/hiveErp/action/DataAnalysisCustomer.java
@@ -1,5 +1,6 @@
package com.matrix.system.hiveErp.action;
+import com.matrix.component.redis.RedisClient;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.WebUtil;
@@ -34,7 +35,6 @@
@Autowired
DataAnalysisCustomerServiceImpl dataAnalysisCustomerService;
-
/**
* 会员人头数统计
--
Gitblit v1.9.1