Merge branch 'local_20221024' into haucheng_panzhihua

yanghui

2022-10-31 a899a229a54932495097bdfb2655822d06f8dbe1

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