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

puhanshu

2022-07-22 e429dde04a49087cd10df396547215e176a0e754

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