Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-11-08 fe3d8816882117d963c93b678573bb93f0047911

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