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

xuhy

2025-08-27 d4c12b3ad2ae1c052b3b080a68398448e56b619a

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

@@ -57,5 +57,9 @@

    GoodsVO goodsDetail(Long goodsId);

    void addGoodsByShop(AddGoodsDTO addGoodsDTO);
    Integer addGoodsByShop(AddGoodsDTO addGoodsDTO);

    Integer editGoodsByShop(AddGoodsDTO addGoodsDTO);

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