From 74db7e89e994ad20267d5f7caefae97066e7d5b3 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 03 十一月 2022 16:28:39 +0800
Subject: [PATCH] 普达-反馈，社区动态处理
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsMerchantVO.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 73269c4..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
@@ -40,7 +40,7 @@
private Integer publishLimit;
@ApiModelProperty("到期时间")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date expireAt;
@ApiModelProperty("商家地址")
@@ -56,12 +56,21 @@
private String introduction;
@ApiModelProperty("首次点亮时间")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @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