From 0430cf26ba8646c65ffb1d1a0fbdb191a8c29d74 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期四, 17 十一月 2022 16:30:02 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientMerchantVO.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientMerchantVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientMerchantVO.java
index 156f17f..eacb605 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientMerchantVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientMerchantVO.java
@@ -1,9 +1,12 @@
package com.panzhihua.common.model.vos.community.convenient;
+import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.enums.MerchantBusinessPeriod;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -21,6 +24,7 @@
public class ConvenientMerchantVO {
@ApiModelProperty("商家ID")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("商家名称")
@@ -103,6 +107,18 @@
@ApiModelProperty("该商家存有商品，最多返回两条")
private List<ConvenientProductVO> productVOList;
+ @ApiModelProperty("服务范围")
+ private Integer serviceRange;
+
+ @ApiModelProperty("手机号")
+ private String mobilePhone;
+
+ @ApiModelProperty("店铺销量")
+ private Integer sale;
+
+ @ApiModelProperty("店铺销售额")
+ private BigDecimal saleVolume;
+
public void setPeriod(String period) {
this.period = MerchantBusinessPeriod.valueOf(period);
}
--
Gitblit v1.7.1