Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-26 43c69b2a7ee65a2664b5749cd33cdd3afe50d791

 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;