Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-06 8cdadf81127b9d34a54d250a3abc878a8d5339c5

 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);
    }
    


}