Merge branch 'ty_fix' into alpha

Helius

2021-11-12 f2dcc25e006086d3c40140f75c987477d224dfe6

 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);
}