Authored by xuhongyun

Merge branch 'dev_2.2' into test

... ... @@ -9,11 +9,11 @@
<input id="skn" class="form-control panel-input height40" type="text" placeholder="请输入SKN" onkeyup="this.value=this.value.replace(/\D/gi,'')">
</div>
<div class="panel-col">
<!-- <div class="panel-col">
<select name="shop" id="shop" tabindex="-1" title="" class="form-control">
<option value="-1">请选择店铺</option>
</select>
</div>
</div> -->
<div class="panel-col">
<select name="brand" id="brand" tabindex="-1" title="" class="form-control">
... ...