Merge branch 'huacheng' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ i...

101captain

2022-04-11 4a697b66a554f84f26ebcf17e8e3c05e827ee8ef

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