Merge branch 'hive2.0' into api

jyy

2021-01-25 dc1a4670261bc852f643d19a83ffc53eeac1b902

 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;


    /**
     * 会员人头数统计