From e9892b2cfb4b33ecb80c033e4074f65a341fc1b3 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 24 Nov 2023 11:56:13 +0800
Subject: [PATCH] 匹配
---
src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java | 4 ++--
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 6 ++----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 665a982..9ee508a 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -255,14 +255,12 @@
DataDictionaryEnum.YU_YUE_START_TIME.getType(),
DataDictionaryEnum.YU_YUE_START_TIME.getCode()
);
- DateTime startTime = cn.hutool.core.date.DateUtil.parseTime(startTimeDic.getValue());
- mallMemberVo.setStartTime(startTime);
+ mallMemberVo.setStartTime(startTimeDic.getValue());
DataDictionaryCustom endTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
DataDictionaryEnum.YU_YUE_END_TIME.getType(),
DataDictionaryEnum.YU_YUE_END_TIME.getCode()
);
- DateTime endTime = DateUtil.parseTime(endTimeDic.getValue());
- mallMemberVo.setEndTime(endTime);
+ mallMemberVo.setEndTime(endTimeDic.getValue());
return new FebsResponse().success().data(mallMemberVo);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
index 817b8ef..a8377a3 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
@@ -87,8 +87,8 @@
@ApiModelProperty(value = "FCM价格")
private BigDecimal fcmPrice;//FCM价格
@ApiModelProperty(value = "预约开始时间")
- private Date startTime;//FCM价格
+ private String startTime;//FCM价格
@ApiModelProperty(value = "预约结束时间")
- private Date endTime;//FCM价格
+ private String endTime;//FCM价格
}
--
Gitblit v1.9.1