Merge branch 'huacheng_paicha' of http://gitlab.nhys.cdnhxx.com/root/zhihui...

101captain

2022-04-28 d26acd522308a33668662d837ea6f5293d22c5d4

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