diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/OptionDisabledDTO.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/OptionDisabledDTO.java index 35fa7ce689..c07a0823cc 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/OptionDisabledDTO.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/OptionDisabledDTO.java @@ -1,6 +1,6 @@ package io.metersphere.system.dto; -import io.metersphere.system.dto.sdk.OptionDTO; +import io.metersphere.system.domain.User; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.NoArgsConstructor; @Data @AllArgsConstructor @NoArgsConstructor -public class OptionDisabledDTO extends OptionDTO { +public class OptionDisabledDTO extends User { @Schema(description = "是否已经关联过") private Boolean disabled = false; } diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtOrganizationMapper.xml b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtOrganizationMapper.xml index 5e1a78d587..06b971d0d4 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtOrganizationMapper.xml +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtOrganizationMapper.xml @@ -102,7 +102,7 @@