Merge branch 'haucheng_panzhihua' into huacheng_test

zhaozhengjie

2022-09-20 d698714e61e1b322ef12d65a52089ceff8a63703

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

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

    private String areaCode;

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