Merge remote-tracking branch 'origin/dev_ic_data' into develop

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml

@@ -402,7 +402,7 @@
     <select id="selectProjectCategoryByDate" resultType="com.epmet.dto.result.ProjectCategoryByDateDTO">
         SELECT
             DISTINCT p.ID AS projectId,
-            CONCAT(#{startDate},' ', DATE_FORMAT(p.CREATED_TIME,'%h:%i:%s')) AS createdTime,
+            CONCAT(#{startDate},' ', DATE_FORMAT(p.CREATED_TIME,'%H:%i:%s')) AS createdTime,
             LEFT(pc.CATEGORY_CODE,#{codeLength}) AS categoryCode
         FROM project p
         INNER JOIN project_category pc ON (pc.PROJECT_ID = p.ID AND pc.DEL_FLAG = 0)