diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/IdLabelVO.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/IdLabelVO.java deleted file mode 100644 index 71802fb67053888f4da3606e8d32b0687c106f22..0000000000000000000000000000000000000000 --- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/IdLabelVO.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.youlai.admin.pojo.vo; - - -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.List; - -/** - * 树形下拉视图对象 - */ -@Data -@NoArgsConstructor -public class IdLabelVO { - - public IdLabelVO(Long id, String label) { - this.id = id; - this.label = label; - } - - private Long id; - - private String label; - - @JsonInclude(JsonInclude.Include.NON_NULL) - private List children; - -} diff --git a/youlai-common/common-core/src/main/java/com/youlai/common/domain/ValueLabel.java b/youlai-common/common-core/src/main/java/com/youlai/common/domain/ValueLabel.java deleted file mode 100644 index 42d9c525905c5520cf3c1293f2e56d1537fe685d..0000000000000000000000000000000000000000 --- a/youlai-common/common-core/src/main/java/com/youlai/common/domain/ValueLabel.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.youlai.common.domain; - -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.List; - -/** - * 级联视图对象 - */ -@Data -@Accessors(chain = true) -public class ValueLabel { - - private Long value; - - private String label; - - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List children; -} diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/ValueLabelVO.java b/youlai-common/common-web/src/main/java/com/youlai/common/web/vo/OptionVO.java similarity index 81% rename from youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/ValueLabelVO.java rename to youlai-common/common-web/src/main/java/com/youlai/common/web/vo/OptionVO.java index 34ed26ad3a55c6b9374aff9e669cc0e729fb3550..91f00d60cb9674e892d152733cc7ee53a9f74509 100644 --- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/ValueLabelVO.java +++ b/youlai-common/common-web/src/main/java/com/youlai/common/web/vo/OptionVO.java @@ -1,4 +1,4 @@ -package com.youlai.admin.pojo.vo; +package com.youlai.common.web.vo; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; @@ -17,24 +17,24 @@ import java.util.List; @ApiModel("Select选择器默认Option属性") @Data @NoArgsConstructor -public class ValueLabelVO { +public class OptionVO { - public ValueLabelVO(Long value, String label) { + public OptionVO(T value, String label) { this.value = value; this.label = label; } @ApiModelProperty("选项的值") - private Long value; + private T value; @ApiModelProperty("选项的标签,若不设置则默认与value相同") private String label; @JsonInclude(value = JsonInclude.Include.NON_NULL) - private List children; + private List children; @JsonInclude(value = JsonInclude.Include.NON_NULL) @ApiModelProperty("是否禁用该选项,默认false") public Boolean disabled; -} +} \ No newline at end of file