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

无关风月

2025-08-26 960380f89c9371ba309d6c50b1ab1b677ea74575

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/ShopService.java

@@ -60,4 +60,6 @@
    Integer addGoodsByShop(AddGoodsDTO addGoodsDTO);

    Integer editGoodsByShop(AddGoodsDTO addGoodsDTO);

    PageInfo<ShopBalanceListVO> getBalanceList(String name, Integer pageCurr, Integer pageSize);
}