合并分支 'Branch_liuzhen' 到 'master'

商品管理调整



查看合并请求 !214

 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
 
-    <input type="hidden" name="row[spec_type]" value="20">
     <div class="form-group">
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Admin_user_id')}:</label>
         <label class="control-label col-xs-12 col-sm-2">{:__('Admin_user_id')}:</label>
         <div class="col-xs-12 col-sm-8">
         <div class="col-xs-12 col-sm-8">

@@ -12,6 +12,7 @@
         </div>
         </div>
     </div>
     </div>
     {/eq}
     {/eq}
+    <input type="hidden" name="row[spec_type]" value="20">
     <div class="form-group">
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Goods_name')}:</label>
         <label class="control-label col-xs-12 col-sm-2">{:__('Goods_name')}:</label>
         <div class="col-xs-12 col-sm-8">
         <div class="col-xs-12 col-sm-8">