合并冲突掉的代码

spring

2025-09-02 6e15ba36ab0a264b7c3a038edaf01abbdc71e54b

 src/api/energyManagement/waterManagement.js

@@ -90,3 +90,4 @@
    data: query,
  })
}