Merge remote-tracking branch 'origin/master'

wuzeyu

2024-05-15 fbd4cf5aeb4274938c12030e5d235c65c20c19c3

 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/QueryVo.java

@@ -23,10 +23,10 @@
    public String intakeName;

    @Schema(description = "所属分水房")
    public String divideName;
    public String divideId;

    @Schema(description = "所属片区")
    public String blockName;
    public String blockId;

    @Schema(description = "是否绑定设备")
    //0未绑定  1已绑定