diff --git a/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml b/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml index 80e1c55..752f79c 100644 --- a/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml +++ b/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml @@ -93,6 +93,7 @@ x.db_dn_no ,dn.prd_nm ,DATE_FORMAT(x.reg_dt, '%Y.%m.%d %H:%i') reg_dt + ,dn.company FROM tbl_bf_daily_nutrition_3 x INNER JOIN tbl_db_nutrient dn ON dn.dn_no = x.db_dn_no WHERE x.smc_no = #smc_no# @@ -289,6 +290,7 @@ end ) prd_nm ,x.db_dbc_tp ,DATE_FORMAT(x.reg_dt, '%Y.%m.%d %H:%i') reg_dt + ,dn.company from tbl_bf_daily_nutrition_10 x left join tbl_db_bf_commerce dn on dn.dbc_no = x.db_dbc_no diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_ajax_data.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_ajax_data.ftl index 8a34f3e..bccbfd8 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_ajax_data.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_ajax_data.ftl @@ -74,7 +74,7 @@ function ajax_data(keyword){ var company = result.list[i].company; var barcode = result.list[i].barcode; var imgurl1 = result.list[i].imgurl1; - html +='