Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner into dev

src/permission.js

@@ -27,11 +27,13 @@ router.beforeEach(async (to, from, next) => {
     if (localStorage.getItem('checkEnterpriseBaseInfoFalseHref')) {
       const href = localStorage.getItem('checkEnterpriseBaseInfoFalseHref')
       localStorage.setItem('checkEnterpriseBaseInfoFalseHref', '')
-      setTimeout(() => {
-        Confirm('系统提示', '企业信息设置未完善，是否前往完善？').then(() => {
-          window.location.href = href
-        })
-      }, 4000);
+      if (to.path !== '/recruit/enterprise/entInfoSetting') {
+        setTimeout(() => {
+          Confirm('系统提示', '企业信息设置未完善，是否前往完善？').then(() => {
+            window.location.href = href
+          })
+        }, 4000)
+      }
     }
     if (to.path === '/login') {
       next({ path: '/recruitHome' })