From 26c682ce19075128e7b6433f0352326b2abd6960 Mon Sep 17 00:00:00 2001 From: "gayoun.park" Date: Mon, 15 Dec 2025 15:29:26 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B3=B5=ED=86=B5=EC=BD=94=EB=93=9C=20-=20?= =?UTF-8?q?=EB=B3=80=ED=99=94=ED=83=90=EC=A7=80=20=EB=B6=84=EB=A5=98?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EB=AA=A9=EB=A1=9D=EC=97=90=20=EC=BB=AC?= =?UTF-8?q?=EB=9F=AC=20=ED=95=AD=EB=AA=A9=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kamco/cd/kamcoback/code/CommonCodeApiController.java | 3 ++- .../com/kamco/cd/kamcoback/code/dto/CommonCodeDto.java | 9 +++------ 2 files changed, 5 insertions(+), 7 deletions(-) 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; } } }