Merge branch 'master' into develop1.0

z1415143022

2025-03-25 7b0346ed6bac6b451b3f6f5f1504a51bc88063ec

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