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

huliguo

2025-05-29 cbad982befcf58521b224da1e8898c23c5e0d2c6

 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();



}