Merge branch 'master' into hive2.0

935090232@qq.com

2020-12-02 6d0b3902c57e4145a83cd1dfd423d6d1ab7df6d0

 zq-erp/src/main/resources/templates/views/admin/hive-erp/analysis/customerFlow.html

@@ -202,7 +202,6 @@
    }

    var chartsUtils2 = new ChartsUtils(loadData2);
    chartsUtils2.setDataPackTimeValue();
    chartsUtils2.loadChartData();