Merge remote-tracking branch 'origin/master'

wuzeyu

2024-05-21 12469c426dd8e13cd601c8fddfec63bc9a8df06d

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java

@@ -88,4 +88,14 @@
    @ExcelProperty("备注")
    @ColumnWidth(250)
    private String remarks;

    @Schema(title = "控制器ID")
    @ExcelProperty("控制器ID")
    @ColumnWidth(15)
    private String controllerId;

    @Schema(title = "控制器地址")
    @ExcelProperty("控制器地址")
    @ColumnWidth(15)
    private String rtuAddr;
}