Merge branch 'devs' of https://gitlab.com/big.imcloud/badyfeed/bf.git into devs

src/main/java/com/backoffice/m/bf_food/M_Bf_foodBOImpl.java

@@ -323,7 +323,7 @@ public class M_Bf_foodBOImpl extends AbstractBOManager implements M_Bf_foodBO {
 			generalDAO.setNamespace(SQLMAP_NAMESPACE);			
 			generalDAO.startTransaction();
 
-			result = generalDAO.delete("delete_bf_lac_milk_single", paramMap);
+			result = generalDAO.delete("delete_lac_milk_single", paramMap);
 			
 			generalDAO.commitTransaction();
 		} catch (SQLException e) {
@@ -342,7 +342,7 @@ public class M_Bf_foodBOImpl extends AbstractBOManager implements M_Bf_foodBO {
 			generalDAO.setNamespace(SQLMAP_NAMESPACE);			
 			generalDAO.startTransaction();
 
-			result = generalDAO.delete("delete_bf_lac_memo_single", paramMap);
+			result = generalDAO.delete("delete_lac_memo_single", paramMap);
 			
 			generalDAO.commitTransaction();
 		} catch (SQLException e) {

src/main/resources/sqlmap/m/bf_food/com.backoffice.m.bf_food.xml

@@ -389,7 +389,7 @@
 		           ,dm_second
 		           ,dm_lac 
 		           ,reg_dt
-		    FROM tbl_db_milk
+		    FROM tbl_bf_breast_feed
 		    WHERE 1=1 
 				AND smc_no =#smc_no#  
 		)x
@@ -399,12 +399,12 @@
      
      <select id="select_lac_milk_list_count" resultClass="Integer" parameterClass="dataMap">
 			SELECT COUNT(*)    
-		    FROM tbl_db_milk
+		    FROM tbl_bf_breast_feed
 		    WHERE smc_no =#smc_no#   
      </select>
 	
 	 <insert id="insert_lac_milk" parameterClass="dataMap">
-		  INSERT tbl_db_milk
+		  INSERT tbl_bf_breast_feed
 	    (	smc_no
 			,dm_fg_cd
 			,dm_minute
@@ -447,7 +447,7 @@
 	
 	<delete id="delete_lac_milk_single" parameterClass="dataMap">
     	DELETE
-		FROM tbl_db_milk 
+		FROM tbl_bf_breast_feed 
 		WHERE dm_no = #dm_no#
     </delete>
     

src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_milk.ftl

@@ -344,7 +344,8 @@
 						Swal.fire({text:"등록되지 않았습니다"})
 					}
 				},
-			})
+			});
+			$('#memoPopup').bPopup().close();
 		},
 		
 		go_popup: function() {

src/main/webapp/WEB-INF/views/ftl/m/include/index_bottom_menu.ftl

@@ -1,15 +1,19 @@
 <nav class="iyu_nav">
 	<ul>
 		<li class="nav_list01">
-<#--			<a href="${URL_ROOT}/m/bf_food/index.do?return_url=index">-->
-<#--				<div class="icon">영양</div>-->
-<#--				<div class="tit">영양</div>-->
-<#--			</a>-->
+			<a href="${URL_ROOT}/m/bf_food/index.do?return_url=index">
+				<div class="icon">영양</div>
+				<div class="tit">영양</div>
+			</a>
+		</li>
+	<!--		
+		<li class="nav_list02">
 			<a href="javascript:fncGoRecommend()">
 				<div class="icon">이유식</div>
 				<div class="tit">이유식</div>
 			</a>
 		</li>
+	-->	
 		<li class="nav_list02">
 			<a href="${URL_ROOT}/m/bf_growth/index.do?return_url=index">
 				<div class="icon">분석(성장기록)</div>