Merge remote-tracking branch 'origin/master' into xizang-changyun

yupeng

2025-03-22 17a6a70ab1d9198b37998af9bf63c40e858c623e

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScreenService.java

@@ -83,6 +83,10 @@
        return  tBillService.getStreetRentRank();
    }

    /**
     * 租金收入趋势
     * @return
     */
    public ScreenRentIncomeTrendVO rentIncomeTrend() {
        ScreenRentIncomeTrendVO vo = new ScreenRentIncomeTrendVO();