Merge branch 'master' into hive2.0

935090232@qq.com

2020-12-02 6d0b3902c57e4145a83cd1dfd423d6d1ab7df6d0

 zq-erp/src/main/java/com/matrix/system/hiveErp/analysUtil/StatisticsTimeUtil.java

@@ -14,6 +14,9 @@
 */
public class StatisticsTimeUtil {




    /**
     * 获取map中的值为数组
     * @param yAxisMap