Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-07 5394194396290aa232910a571d6f4ef463a92a6b

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

@@ -5,6 +5,6 @@
/**
 * 明细数值计算器
 */
public interface Caculate {
    public Map<String, Integer> exec(List<StatisticsTimeDaoParam> timeSpaceParam , Long shopId);
public interface Caculate<T> {
    public Map<String, T> exec(List<StatisticsTimeDaoParam> timeSpaceParam , Long shopId, Long companyId);
}