Merge branch 'hotfix_套餐'

@@ -51,7 +51,7 @@ if($("#id").val()){
     $("#budle-table").find("input[name='bundleDiscount']").val($("#edit-discount").val());    
 
     $("#shopLable").text(shopName);
-    $("#discount, input[name=bundleDiscount]").attr('disabled', 'disabled');
+    $("#discount, input[name=bundleDiscount], #shop").attr('disabled', 'disabled');
 }