代码合并冲突解决

huanghongfa

2021-09-24 67b7fca6f21c2088a1887ba2027360efdb089c1c

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ExportSpecialUserDTO.java

@@ -17,7 +17,7 @@
    private String name;
    @ApiModelProperty(value = "小区名字")
    private String areaName;
    @ApiModelProperty(value = "社区id",hidden = true)
    @ApiModelProperty(value = "社区id", hidden = true)
    private Long communityId;
    @ApiModelProperty("标签")
    private String tags;