Merge remote-tracking branch 'origin/develop1.0' into dyl_dev

DYL0109

2025-04-16 75f043dfa6660716364e66ee0b3cf99f44255686

 zhitan-system/src/main/java/com/zhitan/statisticalAnalysis/domain/dto/FlowChartsDTO.java

@@ -55,15 +55,6 @@
        if (ObjectUtils.isEmpty(timeType)) {
            return TimeType.DAY;
        }
        switch (timeType) {
            case DAY:
                return TimeType.HOUR;
            case MONTH:
                return TimeType.DAY;
            case YEAR:
                return TimeType.MONTH;
            default:
                return timeType;
        }
        return timeType;
    }
}