Merge remote-tracking branch 'origin/yuenan' into yuenan

application/admin/view/unishop/product/add.html

@@ -123,12 +123,6 @@
 <!--                   name="row[delivery_id]" type="text" value="">-->
 <!--        </div>-->
 <!--    </div>-->
-<!--    <div class="form-group">-->
-<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Server')}:</label>-->
-<!--        <div class="col-xs-12 col-sm-8">-->
-<!--            {:build_checkboxs('row[server][]', $servers, [], ['class'=>'form-control', 'required'=>''])}-->
-<!--        </div>-->
-<!--    </div>-->
 
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Switch')}:</label>