Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.admin into develop

src/main/java/com/style24/persistence/mybatis/shop/TsaMorebetter.xml

@@ -440,7 +440,7 @@
 			    #{tbTmtbBurdenSq}
 		       ,#{tmtbSq}
 			   ,#{tmtbSupplyCd}
-			   ,#{tmtbBurdenRate}
+			   ,IFNULL(#{tmtbBurdenRate},0)
 			   ,#{useYn}
 			   ,#{regNo}
 			   ,NOW()
@@ -449,7 +449,7 @@
 			   )
 			ON DUPLICATE KEY UPDATE
 								 TMTB_SUPPLY_CD = #{tmtbSupplyCd}
-								 ,TMTB_BURDEN_RATE = #{tmtbBurdenRate}
+								 ,TMTB_BURDEN_RATE = IFNULL(#{tmtbBurdenRate},0)
 								 ,USE_YN = #{useYn}
 								 ,UPD_NO = #{updNo}
 								 ,UPD_DT = NOW()

src/main/webapp/WEB-INF/views/marketing/MorebetterPopupForm.html

@@ -883,7 +883,7 @@
 	// 업체분담율 추가 버튼 클릭시
 	$('#moreBetterForm #btnAddApplyBurden').on('click', function() {
 		//cfnOpenApplyBurdenPopup("fnSetPopupApplyBurdenInfo");
-		cfnOpenCompanyListPopup("fnSetPopupApplyBurdenInfo");
+		cfnOpenCompanyListPopup("fnSetPopupApplyBurdenInfo", "M");
 	});
 
 	// 할인구간 선택삭제 버튼 클릭시