From ceb3d71cd8ba0655b977a5938cfa53cfe9cf8d06 Mon Sep 17 00:00:00 2001
From: jonghwan76 <snut97@naver.com>
Date: Fri, 29 Apr 2022 14:08:24 +0900
Subject: [PATCH] =?UTF-8?q?=EC=B6=94=EC=B2=9C=EC=9D=B4=EC=9C=A0=EC=8B=9D?=
 =?UTF-8?q?=20=EB=A0=88=EC=8B=9C=ED=94=BC=20=EC=8B=9D=EC=9E=AC=EB=A3=8C=20?=
 =?UTF-8?q?=EB=B2=88=ED=98=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 21 ++++++++++++-------
 .../ftl/m/bf_food/view_bf_homemade_popup.ftl  |  2 +-
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ed454c6..700b781 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,11 +9,9 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="계정연동 취소하기 기능적용-2">
+    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="아이정보수정 &gt; 질병기록 오류 수정">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyBOImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyBOImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_family_baby/view_bf_family_baby.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_family_baby/view_bf_family_baby.ftl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/native_login.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/native_login.ftl" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_bf_homemade_popup.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_bf_homemade_popup.ftl" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -238,7 +236,7 @@
       <workItem from="1650881164110" duration="14717000" />
       <workItem from="1651074703299" duration="129000" />
       <workItem from="1651149304746" duration="15131000" />
-      <workItem from="1651193694137" duration="7875000" />
+      <workItem from="1651193694137" duration="9915000" />
     </task>
     <task id="LOCAL-00001" summary="최초 커밋">
       <created>1645354476031</created>
@@ -576,7 +574,14 @@
       <option name="project" value="LOCAL" />
       <updated>1651167758932</updated>
     </task>
-    <option name="localTasksCounter" value="49" />
+    <task id="LOCAL-00049" summary="아이정보수정 &gt; 질병기록 오류 수정">
+      <created>1651202097639</created>
+      <option name="number" value="00049" />
+      <option name="presentableId" value="LOCAL-00049" />
+      <option name="project" value="LOCAL" />
+      <updated>1651202097639</updated>
+    </task>
+    <option name="localTasksCounter" value="50" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -596,7 +601,6 @@
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
-    <MESSAGE value="회원가입 오류 수정" />
     <MESSAGE value="아이디/비밀번호 찾기 적용" />
     <MESSAGE value="계정관리 퍼블리싱 적용-1" />
     <MESSAGE value="회원가입 퍼블리싱 페이지 적용" />
@@ -621,6 +625,7 @@
     <MESSAGE value="체크리스트 오류 수정" />
     <MESSAGE value="계정연동 취소하기 기능적용-1" />
     <MESSAGE value="계정연동 취소하기 기능적용-2" />
-    <option name="LAST_COMMIT_MESSAGE" value="계정연동 취소하기 기능적용-2" />
+    <MESSAGE value="아이정보수정 &gt; 질병기록 오류 수정" />
+    <option name="LAST_COMMIT_MESSAGE" value="아이정보수정 &gt; 질병기록 오류 수정" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_bf_homemade_popup.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_bf_homemade_popup.ftl
index b43c615..8681eab 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_bf_homemade_popup.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_bf_homemade_popup.ftl
@@ -29,7 +29,7 @@
                                 <#list model[ 'lm_ingre'] as item>
                                     <li>
 <#--                                        <img src="${URL_STATIC_ROOT}/m/db/ingre/${item['food_cd']!}.png" onerror="this.src='${URL_STATIC_ROOT}/m/db/homemade/bowl.png';" alt="식재료 이미지" />-->
-                                        <span class="tit">${item_index}.${item['di_name']!}</span>
+                                        <span class="tit">${item_index+1}.${item['di_name']!}</span>
                                         <div class="basket">
                                             <span>${item['g']!}g</span>
                                             <a href="javascript:insert_cart(${item['di_no']!},'${item['di_name']!}')" class="hidden <#if item['c_reg_dt']??>active</#if>">장바구니 담기</a>