Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-11 f404fc8f587beb723bb8fd905766490428870ebc

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientMerchantVO.java

@@ -106,6 +106,12 @@
    @ApiModelProperty("该商家存有商品，最多返回两条")
    private List<ConvenientProductVO> productVOList;

    @ApiModelProperty("服务范围")
    private Integer serviceRange;

    @ApiModelProperty("手机号")
    private String mobilePhone;

    public void setPeriod(String period) {
        this.period = MerchantBusinessPeriod.valueOf(period);
    }