Merge branch 'develop1.0' into wt_from_develop1.0

VVT789

2025-04-18 4a13279fe13ad1cf6736670f6d1c5c61c8cba59b

 zhitan-admin/src/main/java/com/zhitan/web/controller/itemizedenergyanalysis/ItemizedEnergyAnalysisController.java

@@ -28,7 +28,7 @@
     * @param dataItem
     * @return
     */
    @GetMapping("list")
    @GetMapping("/list")
    private AjaxResult list(ItemizedEnergyAnalysisDTO dataItem) {
        ItemizedEnergyAnalysisVO list = itemizedEnergyAnalysisService.getItemizedEnergyAnalysisService(dataItem);
        return success(list);