From bb4825f57b22b841c5eb6db4d72447e6036b3c9b Mon Sep 17 00:00:00 2001 From: yanghui <2536613402@qq.com> Date: 星期二, 08 十一月 2022 11:02:47 +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 | 3 +++ 1 files changed, 3 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 4709879..b2c8af9 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 @@ -113,6 +113,9 @@ private String areaCode; + @ApiModelProperty("服务范围") + private Integer serviceRange; + public String getPeriod() { return period.name(); } -- Gitblit v1.7.1