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

mitao

2025-04-03 4e1d9877d6f2652dafb0fed1ee27f25ba11afcc6

 ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java

@@ -87,7 +87,7 @@

    Boolean cashPay(CachPayDto offlinePayDto);

    BillStatisticsDto statistics();
    BillStatisticsDto statistics(String busdeptId);

    Integer batchBillCount(String userId, List<String> billIds);

@@ -95,5 +95,5 @@
     * 查询街道租金排行
     * @return
     */
    List<ScreenRentRankVO> getStreetRentRank();
    List<ScreenRentRankVO> getStreetRentRank(String businessDeptId);
}