From 1f649d3a2a7b631b71d16bcc046c3c6c32c2ecbf Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 29 十一月 2022 14:51:49 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientMerchantDTO.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientMerchantDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientMerchantDTO.java
index 36a9e18..c711b1d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientMerchantDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientMerchantDTO.java
@@ -111,6 +111,17 @@
@ApiModelProperty(value = "更新人", hidden = true)
private Long updatedBy;
+ private String areaCode;
+
+ @ApiModelProperty("服务范围")
+ private Integer serviceRange;
+
+ @ApiModelProperty("微信手机号")
+ private String mobilePhone;
+
+ @ApiModelProperty("详细地址")
+ private String detailedAddress;
+
public String getPeriod() {
return period.name();
}
--
Gitblit v1.7.1