From b448c334240851b2e13f92d3a26db176580949cb Mon Sep 17 00:00:00 2001
From: ali <ali9696@163.com>
Date: 星期四, 23 一月 2025 15:48:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into develop_alioo
---
zhitan-system/src/main/java/com/zhitan/peakvalley/domain/dto/PeakValleyDTO.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/peakvalley/domain/dto/PeakValleyDTO.java b/zhitan-system/src/main/java/com/zhitan/peakvalley/domain/dto/PeakValleyDTO.java
index b9f6021..392d3e5 100644
--- a/zhitan-system/src/main/java/com/zhitan/peakvalley/domain/dto/PeakValleyDTO.java
+++ b/zhitan-system/src/main/java/com/zhitan/peakvalley/domain/dto/PeakValleyDTO.java
@@ -1,6 +1,7 @@
package com.zhitan.peakvalley.domain.dto;
import com.zhitan.common.enums.TimeType;
+import com.zhitan.common.utils.StringUtils;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -49,17 +50,19 @@
public String getTimeType() {
-
+ String result = TimeType.DAY.name();
switch (TimeType.valueOf(this.timeType)) {
case HOUR:
case DAY:
- return TimeType.HOUR.name();
- case MONTH:
- return TimeType.DAY.name();
+ result= TimeType.HOUR.name();
+ break;
case YEAR:
- return TimeType.MONTH.name();
+ result= TimeType.MONTH.name();
+ break;
+ case MONTH:
default:
- return TimeType.DAY.name();
+ break;
}
+ return result;
}
}
--
Gitblit v1.9.3