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

张天森

2022-11-08 947d016e4bd349b78d540e3a869f55d68b2c610c

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

@@ -111,6 +111,11 @@
    @ApiModelProperty(value = "更新人", hidden = true)
    private Long updatedBy;

    private String areaCode;

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

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