From cbad982befcf58521b224da1e8898c23c5e0d2c6 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 29 五月 2025 16:49:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TScreenContentService.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TScreenContentService.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TScreenContentService.java
index c1ce779..35769eb 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TScreenContentService.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TScreenContentService.java
@@ -7,6 +7,7 @@
 import com.ruoyi.other.vo.PhotovoltaicPowerGenerationVO;
 import com.ruoyi.other.vo.ScreenTopVO;
 
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -24,4 +25,12 @@
     PhotovoltaicPowerGenerationVO photovoltaicPowerGeneration(List<Integer> siteIds);
 
     ScreenTopVO top(List<Integer> siteIds);
+
+    void carportData(Integer parkingPlace, Integer remainPlace);
+
+
+    HashMap<String, Object> getCarportData();
+
+
+
 }

--
Gitblit v1.7.1