3 年之前 · f0e81dfb39
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 
				 .DS_Store
			
 
				 node_modules/
			
 
				-# dist/
			
 
				+dist/
			
 
				 npm-debug.log*
			
 
				 yarn-debug.log*
			
 
				 yarn-error.log*
			
--- a/dist/index.html
+++ b/dist/index.html
--- a/dist/static/js/chunk-d22532c8.18d0771b.js
+++ b/dist/static/js/chunk-d22532c8.18d0771b.js
--- a/dist/static/js/chunk-d22532c8.18d0771b.js.gz
+++ b/dist/static/js/chunk-d22532c8.18d0771b.js.gz
--- a/src/views/stock/check/index.vue
+++ b/src/views/stock/check/index.vue
@@ -133,15 +133,6 @@
 
				                     重置
			
 
				                   </el-button>
			
 
				                 </el-col>
			
 
				-<<<<<<< HEAD
			
 
				-<<<<<<< HEAD
			
 
				-             
			
 
				-=======
			
 
				-               
			
 
				->>>>>>> live
			
 
				-=======
			
 
				-
			
 
				->>>>>>> live
			
 
				                 <el-col
			
 
				                   :span="3"
			
 
				                   style="width: 66px; float: right"