Merge remote-tracking branch 'origin/master'

CeDo

2021-04-17 9e5fc994204fe9b846b212510f5b2bb792aaaf51

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopStoreVO.java

@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;


/**
 * @auther lyq
@@ -26,4 +28,16 @@
    @ApiModelProperty("配送方式（1.商家配送  2.快递物流）")
    private Integer deliveryType;

    @ApiModelProperty("店铺详情")
    private String storeDetail;

    @ApiModelProperty("店铺描述")
    private String storeDescribe;

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

    @ApiModelProperty("店内商品列表")
    private List<ComShopGoodsVO> goodsList;

}