diff --git a/src/main/java/com/kamco/cd/kamcoback/code/CommonCodeApiController.java b/src/main/java/com/kamco/cd/kamcoback/code/CommonCodeApiController.java index c3ff3942..44d43fd7 100644 --- a/src/main/java/com/kamco/cd/kamcoback/code/CommonCodeApiController.java +++ b/src/main/java/com/kamco/cd/kamcoback/code/CommonCodeApiController.java @@ -224,7 +224,8 @@ public class CommonCodeApiController { commonCodeUtil.getChildCodesByParentCode("0000").stream() .map( child -> - new CommonCodeDto.Clazzes(child.getCode(), child.getName(), child.getOrder())) + new CommonCodeDto.Clazzes( + child.getCode(), child.getName(), child.getOrder(), child.getProps2())) .toList(); return ApiResponseDto.ok(list); diff --git a/src/main/java/com/kamco/cd/kamcoback/code/dto/CommonCodeDto.java b/src/main/java/com/kamco/cd/kamcoback/code/dto/CommonCodeDto.java index ea1b34de..82cf4312 100644 --- a/src/main/java/com/kamco/cd/kamcoback/code/dto/CommonCodeDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/code/dto/CommonCodeDto.java @@ -1,6 +1,5 @@ package com.kamco.cd.kamcoback.code.dto; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.kamco.cd.kamcoback.common.utils.html.HtmlEscapeDeserializer; @@ -167,16 +166,14 @@ public class CommonCodeDto { private String code; private String name; - - @JsonInclude(JsonInclude.Include.NON_NULL) - private Double score; - private Integer order; + private String color; - public Clazzes(String code, String name, Integer order) { + public Clazzes(String code, String name, Integer order, String color) { this.code = code; this.name = name; this.order = order; + this.color = color; } } }