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

xuhy

2025-08-26 4deac7de8ec77a4de569a91b9790778d669e8e0f

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