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

src/main/java/com/backoffice/m/memory/M_MemoryController.java

@@ -96,6 +96,8 @@ public class M_MemoryController extends AbstractControllerManager{
 					return redirect_url;
 				}
 
+				paramMap.put("member_id", rm_mem.get("member_id"));
+
 				List<DataMap> time_list = memoryBO.select_timeline(paramMap);
 				DataMap.putToModel(model, "time_list", time_list);
 				DataMap.putToModel(model, "rm_mem", rm_mem);

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

@@ -237,7 +237,8 @@
 				 INNER JOIN tbl_bf_daily_nutrition b on a.smc_no = b.smc_no
 				 INNER JOIN tbl_code_item_str c on b.nutirition_cd_no = c.cd_no
 		WHERE
-			a.smc_no = #smc_no#
+			a.member_id = #member_id#
+			and a.smc_no = #smc_no#
 		    and b.reg_dt between date_add(now(),interval -1 month ) and now()
 		ORDER BY b.reg_dt
     </select>