Merge remote-tracking branch 'origin/master'

wuzeyu

2024-06-11 99ea8b4fc0d7fdd866797b33c7ce773730d42afa

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

@@ -25,7 +25,7 @@
    private String id;

    @Schema(description = "灌溉面积")
    private Integer area;
    private Double area;

    @Schema(description = "备注")
    private String remarks;