Merge remote-tracking branch 'origin/master'

wuzeyu

2024-01-15 835ac4c14a2ae8d17578e2b7bbbaa54d5a12f40a

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

@@ -28,6 +28,11 @@
    @ColumnWidth(10)
    private Long id;

    @Schema(title = "分水房编号")
    @ExcelProperty("分水房编号")
    @ColumnWidth(15)
    private String divideId;

    @Schema(title = "分水房名称")
    @ExcelProperty("分水房名称")
    @ColumnWidth(15)