Merge branch 'live' into sit

src/views/stock/check/index.vue

@@ -139,7 +139,11 @@
                     重置
                   </el-button>
                 </el-col>
+<<<<<<< HEAD
              
+=======
+               
+>>>>>>> live
                 <el-col
                   :span="3"
                   style="width: 66px; float: right"
@@ -191,8 +195,8 @@
             ></i>
           </el-tooltip>
         </template>
-      </ex-table>
-      <add-model
+      </ex-table> -->
+      <!-- <add-model
         :id="modelId"
         :sitem="sitem"
         :show-model="showModel"