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

无关风月

2025-08-14 79d5e91444eca538d523d3bd014528abd939da33

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/ShopMapper.java

@@ -31,7 +31,7 @@

    List<GoodsVO> selectListByShopId(PageInfo<GoodsVO> pageInfo, @Param("shopId") Integer shopId);

    List<ShopBalanceListVO> getBalanceList(PageInfo<ShopBalanceListVO> pageInfo, String name);
    List<ShopBalanceListVO> getBalanceList(PageInfo<ShopBalanceListVO> pageInfo,@Param("name") String name);

    List<ShopBalanceExcel> shopBalanceExcel(String name);
    List<ShopBalanceExcel> shopBalanceExcel(@Param("name")String name);
}