Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-11 f404fc8f587beb723bb8fd905766490428870ebc

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientMerchantDTO.java

@@ -115,6 +115,8 @@

    @ApiModelProperty("服务范围")
    private Integer serviceRange;
    @ApiModelProperty("微信手机号")
    private String mobilePhone;

    public String getPeriod() {
        return period.name();