Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

wuzeyu

2024-07-23 7b5a12d1114b9609ea39bb1b201dfe50bf252c76

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