Merge branch 'master' into test

935090232@qq.com

2020-12-05 e945c6e78264a8fdf3cb57f3b33beb2d452516cf

 zq-erp/src/main/java/com/matrix/system/hiveErp/dao/TjVipSumDao.java

@@ -14,4 +14,6 @@
    Map<String,Integer> customerHeadCompare(@Param("list") List<StatisticsTimeDaoParam> daoParams, @Param("shopId") Long shopId);

    Map<String, Integer> customerEnterCountCompare(@Param("list") List<StatisticsTimeDaoParam> timeSpaceParam, @Param("shopId") Long shopId);

   Map<String, Integer> customerEnterRateCompare(@Param("list") List<StatisticsTimeDaoParam> timeSpaceParam, @Param("shopId") Long shopId);
}