From d9a8c2818c7e12b531aa83c07747d337adc5a0c7 Mon Sep 17 00:00:00 2001 From: dengzedong <dengzedong@email> Date: 星期三, 08 一月 2025 11:31:49 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- iailab-framework/iailab-common-biz-ip/src/main/java/com/iailab/framework/ip/core/Area.java | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/iailab-framework/iailab-common-biz-ip/src/main/java/com/iailab/framework/ip/core/Area.java b/iailab-framework/iailab-common-biz-ip/src/main/java/com/iailab/framework/ip/core/Area.java index 2f94e55..fba926e 100644 --- a/iailab-framework/iailab-common-biz-ip/src/main/java/com/iailab/framework/ip/core/Area.java +++ b/iailab-framework/iailab-common-biz-ip/src/main/java/com/iailab/framework/ip/core/Area.java @@ -1,9 +1,11 @@ package com.iailab.framework.ip.core; +import com.fasterxml.jackson.annotation.JsonManagedReference; import com.iailab.framework.ip.core.enums.AreaTypeEnum; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.ToString; import java.util.List; @@ -17,6 +19,7 @@ @Data @AllArgsConstructor @NoArgsConstructor +@ToString(exclude = {"parent"}) public class Area { /** @@ -46,10 +49,12 @@ /** * 父节点 */ + @JsonManagedReference private Area parent; /** * 子节点 */ + @JsonManagedReference private List<Area> children; } -- Gitblit v1.9.3