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

lidongdong

2022-11-28 cf985b57d178fad1e18b46b9b020548a90d3d915

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