Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-17 6e907cce72e42a349123800d697aa99f3360783e

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientMerchantDO.java

@@ -4,6 +4,7 @@
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;

/**
@@ -131,4 +132,14 @@
     * 手机号
     */
    private String mobilePhone;

    /**
     * 店铺销量
     */
    private Integer sale;

    /**
     * 店铺销售额
     */
    private BigDecimal saleVolume;
}