Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-25 6c6c0825e59377261b9972af95e1e4dafb43fcfd

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

@@ -119,6 +119,12 @@
    @ApiModelProperty("店铺销售额")
    private BigDecimal saleVolume;

    @ApiModelProperty("详细地址")
    private String detailedAddress;

    @ApiModelProperty("商家评分")
    private BigDecimal score;

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