Merge branch 'develop1.0' into wt_from_develop1.0

VVT789

2025-04-18 1f4733e4adfde41cd09542d91cd17a2b6965a610

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