Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-08 bb4825f57b22b841c5eb6db4d72447e6036b3c9b

 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();
    }