From ab60d6eb8b4a23a55ad202a56ef91cda9fd6fb37 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期六, 23 七月 2022 14:31:56 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsMerchantVO.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsMerchantVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsMerchantVO.java
index 97113e6..8a46982 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsMerchantVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsMerchantVO.java
@@ -2,6 +2,7 @@
import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -39,6 +40,7 @@
private Integer publishLimit;
@ApiModelProperty("到期时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date expireAt;
@ApiModelProperty("商家地址")
@@ -54,8 +56,21 @@
private String introduction;
@ApiModelProperty("首次点亮时间")
- private Date firstLit;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date firstLitAt;
+
+ @ApiModelProperty("剩余点亮天数")
+ private Integer surplusLitDays;
@ApiModelProperty("账号状态（1.启用 2.禁用）")
private Integer accountStatus;
+
+ @ApiModelProperty("空闲戳戳点")
+ private Integer idleTotal;
+
+ @ApiModelProperty("距离")
+ private Double distance;
+
+ @ApiModelProperty("客服电话")
+ private String customPhone;
}
--
Gitblit v1.7.1