Merge branch 'release/1.6' of git.dev.yoho.cn:platform/yohobuy-portal-fe into release/1.6

@@ -77,6 +77,7 @@ if ($('.contentpanel').data('type') == 'info') {
 	$('#saveAllInfo').hide();
 	$(".goods-img i").remove();
 	$("#search-key-list").hide();
+	$(".brand-list").hide();
 
 	// 上架审核的查看页面
 	if ($('.contentpanel').data('action') != 'audit') {

@@ -44,7 +44,7 @@
                 <label style="cursor: pointer;"><input name="[[b.attributeId]]" type="[[b.inputType]]" value="[[c.id]]">[[c.text]]</label>
                 [[/each]]
             </span>
-            <input id="[[b.attributeId]]" type="hidden" for="[[b.inputType]]" value="[[b.selectedValues]]" required="required">
+            <input id="[[b.attributeId]]" type="hidden" for="[[b.inputType]]" value="[[b.selectedValues]]" [[b.isMust=="N"?"":"required"]] placeholder="[[b.attributeName]]">
         </div>
         [[/if]]
     [[/each]]