解决冲突

liurunyu

2024-07-25 7af935e6a092193adf309f3a2d700f049b4b63d8

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

@@ -23,5 +23,5 @@
    public String divideName;

    @Schema(description = "片区名称")
    public String blockName;
    public String blockId;
}