Merge remote-tracking branch 'origin/master'

wuzeyu

2024-12-13 dd2259bcc1cfe4e31f297af3df1e94d2b95d7476

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoUnitOne.java

@@ -47,4 +47,10 @@
     */
    @Schema(description = "操作时间")
    private Date operateDt;

    @Schema(description = "取水口Id")
    public String intakeId;

    @Schema(description = "取水口名称")
    public String intakeName;
}