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

lidongdong

2022-10-21 3bebb73426404e27e07a89d06b49a6a24ae84982

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