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

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

@@ -139,6 +139,22 @@
 		</isNotEmpty>
     </select>
     
+    <select id="select_bf_growth_body_list_count"  resultClass="Integer" parameterClass="dataMap">
+		SELECT count(*) 
+		FROM tbl_bf_growth_body x
+		INNER JOIN tbl_bf_family_match y on x.smc_no = y.smc_no
+	 	INNER JOIN tbl_bf_family_baby smc  on x.smc_no = smc.smc_no
+		WHERE 1 =1
+		  AND y.member_id = #member_id#
+		  AND x.smc_no = #smc_no#
+	 	  AND x.smc_no = smc.smc_no
+	 	  AND DATE_ADD(smc.birthday, INTERVAL +60 MONTH) <![CDATA[>=]]> x.base_dt 
+	 	 <isNotEmpty property="sgb_no">
+	 	 	AND x.sgb_no = #sgb_no#
+	 	 </isNotEmpty>	 
+			 
+    </select>
+    
     <select id="select_bf_growth_body_last_by_sgb_no" resultClass="dataMap" parameterClass="dataMap">
 		SELECT 
 			 x.sgb_no
@@ -166,15 +182,6 @@
 		
 		LIMIT 0, 1
     </select>
-    
-    <select id="select_bf_growth_body_list_count" resultClass="Integer" parameterClass="dataMap">
-		SELECT COUNT(*)
-		FROM tbl_bf_growth_body x
-		INNER JOIN tbl_bf_family_match y on x.smc_no = y.smc_no
-		WHERE 1 =1
-		AND y.member_id = #member_id#
-	    AND x.smc_no = #smc_no# 
-    </select>
 
     <select id="select_bf_growth_body_by_base_dt" resultClass="dataMap" parameterClass="dataMap">
 		SELECT x.*

src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_top.ftl

@@ -212,8 +212,8 @@
         }
     });
 
-    /*********Camera 및 사진 업로드*********/
     $(function() {
+  		  /*********Camera 및 사진 업로드*********/
         // 사진 삭제
         $(document).on('click', '#btn_delImg01, #btn_delImg02, #btn_delImg03', function(){
              var imgSeq = this.id.replace('btn_delImg','');

src/main/webapp/WEB-INF/views/ftl/m/bf_growth_body/view_bf_growth_body_input.ftl

@@ -50,7 +50,7 @@
 					<div class="p_header_pic">
 						<div class="pic hidden" style="background: url(${thumb_path})">프로필 사진</div>
 						<div class="child_tit">
-							<div class="name"><a href="javascript:CMD_MEASUREMENT_HEIGHT('${model['rm_child']['smc_no']}');">${model['rm_child']['name']}</a></div>
+							<div class="name">${model['rm_child']['name']}</a></div>
 							<div class="age">${model['rm_child']['age_y']!}세 ${model['rm_child']['age_m']!}개월</div>
 						</div>
 					</div>
@@ -111,7 +111,7 @@
 					</div>
 					<#--페이지네이션-->
 					<ul class="pagination">
-						<@b.Paging url="${URL_PATH}/view_bf_growth_body_input.do"
+						<@b.Paging url="${URL_PATH}/m/bf_growth_body/view_bf_growth_body_input.do"
 						pageCount="${model['page']['pageCount']?c}"
 						rowCount="${model['page']['rowCount']?c}"
 						rowMax="${model['page']['rowMax']?c}"

src/main/webapp/m/css/style.css

@@ -1385,8 +1385,8 @@ main {
 
 .result_num_box .result_num {
     color: #004A71;
-    font-size: 1.4375rem;
+    font-size: 1.0rem;
-    line-height: 1.4375rem;
+    line-height: 1.0rem;
     font-weight: 500;
 }
 
@@ -15263,7 +15263,6 @@ main.sona_cont_measurement {
 }
 
 /* 8-14.설정하기-음악설정 */
-{}
 
 /* 8-15.설정하기-카테고리수정 */
 .m_set_recode_order {