Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

lidongdong

2022-12-06 2a212f983f35e1c569dfec3a172fb5f0c9f85fac

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientMerchantDTO.java

@@ -115,9 +115,13 @@

    @ApiModelProperty("服务范围")
    private Integer serviceRange;

    @ApiModelProperty("微信手机号")
    private String mobilePhone;

    @ApiModelProperty("详细地址")
    private String detailedAddress;

    public String getPeriod() {
        return period.name();
    }