Merge branch 'master' into develop1.0

VVT789

2025-02-17 466c70dccc2b46ffa62fd14c8b2f88349c5ef9c6

 zhitan-common/src/main/java/com/zhitan/common/utils/ChartUtils.java

@@ -37,6 +37,7 @@
                    Date tempD = DateTimeUtil.toDateTime(tempCode, DateTimeUtil.COMMON_PATTERN_END_WITH_MINUTE);
                    dateList.add(tempD);
                }
                break;
            case TimeTypeConst.TIME_TYPE_DAY:
                if (!timeCode.contains(CommonConst.SINGLE_MINUS_SIGN)) {
                    timeCode = DateTimeUtil.toDateTimeStr(timeCode, DateTimeUtil.COMMON_PATTERN_DAY, DateTimeUtil.COMMON_PATTERN_TO_DAY);