Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-18 17870eeeca47c08244b244c0acb7fe3f3216621f

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java

@@ -85,12 +85,12 @@
    /**
     * 删除商品
     *
     * @param id
     * @param goodsId
     * @return
     */
    @PostMapping("deleteShopGoods")
    public R deleteFlowerShopGoods(@RequestBody Long[] id) {
        return comShopFlowerGoodsService.deleteShopFlowerGoods(id);
    @DeleteMapping("deleteShopGoods")
    public R deleteFlowerShopGoods(@RequestParam("goodsId") Long goodsId) {
        return comShopFlowerGoodsService.deleteShopFlowerGoods(goodsId);
    }

    /**
@@ -99,7 +99,7 @@
     * @param goodsId 商品id
     * @return 商品信息
     */
    @PostMapping("shopGoodsDetail")
    @GetMapping("shopGoodsDetail")
    public R shopFlowerGoodsDetail(@RequestParam("goodsId") Long goodsId) {
        return comShopFlowerGoodsService.shopFlowerGoodsDetail(goodsId);
    }