From 4ad4b51a4fb177eafee8a3a355496e7b6c1be662 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 11 七月 2024 16:24:46 +0800
Subject: [PATCH] 花城 小程序签退打卡获取积分详情报错2
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerMerchantVO.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerMerchantVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerMerchantVO.java
index a4455d4..21c8043 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerMerchantVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerMerchantVO.java
@@ -105,14 +105,12 @@
* 营业开始时间
*/
@ApiModelProperty(value = "营业开始时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date businessStartTime;
+ private String businessStartTime;
/**
* 营业结束时间
*/
@ApiModelProperty(value = "营业结束时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date businessEndTime;
+ private String businessEndTime;
/**
* 活动名称
*/
@@ -148,5 +146,9 @@
@ApiModelProperty(value = "商家类型名称")
private String merchantTypeName;
+ @ApiModelProperty(value = "商家评分")
+ private String merchantGrade;
+ @ApiModelProperty(value = "商家积分")
+ private String merchantIntegral;
}
--
Gitblit v1.7.1