Merge remote-tracking branch 'origin/test' into test

CeDo

2021-05-11 e09eb1cce0056bfda9f2202d412d54e30502e71b

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopGoodsService.java

@@ -38,11 +38,9 @@
    /**
     * 商品列表-分页查询
     * @param pageComShopGoodsDTO 查询参数
     * @return ComShopStoreVO
     * @return PageShopStoreVO
     */
    R pageGoodsList(PageComShopGoodsDTO pageComShopGoodsDTO);



    /**
     * 编辑商品