Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-06 c9d5426b2055fdd576c750098bea530d588f0ea9

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java

@@ -87,6 +87,7 @@
        Goods goods = goodsService.getById(id);
        return R.ok(goods);
    }
    


}