Merge remote-tracking branch 'origin/master'

huanghongfa

2021-04-20 4e8be752d24ae22362455c16f75d3bcbccb23359

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

@@ -57,6 +57,9 @@
    @ApiModelProperty("店铺销量")
    private Integer sale;

    @ApiModelProperty("店铺登陆密码")
    private String storePassword;

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