From f404fc8f587beb723bb8fd905766490428870ebc Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 11 十一月 2022 10:10:48 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientMerchantVO.java | 6 ++++++
1 files changed, 6 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 6bdb56f..4e450ee 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
@@ -106,6 +106,12 @@
@ApiModelProperty("该商家存有商品，最多返回两条")
private List<ConvenientProductVO> productVOList;
+ @ApiModelProperty("服务范围")
+ private Integer serviceRange;
+
+ @ApiModelProperty("手机号")
+ private String mobilePhone;
+
public void setPeriod(String period) {
this.period = MerchantBusinessPeriod.valueOf(period);
}
--
Gitblit v1.7.1