Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-20 26cd8c7b2bc7a725a3de28d3ed883a6f54da84f1

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

@@ -110,5 +110,5 @@
     * 店铺信息
     */
    @ApiModelProperty("商品店铺信息")
    private ComShopStoreVO shopStoreVO;
    private PageShopStoreVO shopStoreVO;
}