Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-17 6e907cce72e42a349123800d697aa99f3360783e

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

@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos.community.convenient;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

@@ -112,6 +113,12 @@
    @ApiModelProperty("手机号")
    private String mobilePhone;

    @ApiModelProperty("店铺销量")
    private Integer sale;

    @ApiModelProperty("店铺销售额")
    private BigDecimal saleVolume;

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