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

Administrator

2024-05-20 b5742c2a79bdcc9ef276a7a671fcaa07a7fe5d7c

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