fix: 合并master

src/views/dike/runManage/enginerring/inspectionItems/index.vue

@@ -68,7 +68,6 @@ export default {
           this.tableData = res.records;
           this.pageData.total = res.total;
         }
-        console.log("🚀表格数据🚀", res);
       });
     },
     // 重置搜索

src/views/loginbg.vue

@@ -187,7 +187,7 @@ export default {
             })
             .catch(() => {
               this.loading = false;
-              this.getCode();
+              // this.getCode();
             });
         }
       });

vue.config.js

@@ -37,8 +37,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: "http://shuili-admin.product.dev.com:30115",
+        target: "http://shuili-admin.product.dev.com:30115",
-        target: "http://127.0.0.1:18082",
+        // target: "http://127.0.0.1:18082",
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: '/tianhui-admin-web'