Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-11-06 dc75a139edc58a71bbbd8b94ed94287b7f3727fe

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

@@ -380,10 +380,7 @@
                return AjaxResult.success(data);
            }
        }


        return R.ok();

        return AjaxResult.success();
    }