Merge remote-tracking branch 'origin/master'

.gitignore

@@ -9,6 +9,7 @@ yarn-error.log*
 tests/**/coverage/
 tests/e2e/reports
 selenium-debug.log
+UDI_WMS_NEW/
 
 # Editor directories and files
 .idea

src/utils/request.js

@@ -85,7 +85,7 @@ service.interceptors.response.use(res => {
     if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') {
       return res.data
     }
-    if (code === 401) {
+    if (code === 2) {
       if (!isRelogin.show) {
         isRelogin.show = true;
         MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {

src/views/basic/product/product.vue

@@ -19,13 +19,7 @@
             </el-tree>
           </div>
         </el-col>
-        <el-col
+        <el-col style="border-left: 3px solid #dddddd; overflow-y: hidden">
-          style="
-            border-left: 3px solid #dddddd;
-            overflow-x: scroll;
-            overflow-y: hidden;
-          "
-        >
           <el-form
             :model="filterQuery"
             size="mini"