Merge remote-tracking branch 'origin/master'

ant-design-vue-jeecg/src/config/router.config.js

@@ -587,6 +587,12 @@ export const constantRouterMap = [
         name: 'register',
         component: () => import(/* webpackChunkName: "user" */ '@/views/user/register/Register')
       },
+
+      {
+        path: 'sgin',
+        name: 'sgin',
+        component: () => import(/* webpackChunkName: "user" */ '@/views/personalCenter/SignInView')
+      },
       {
         path: 'register-result',
         name: 'registerResult',

ant-design-vue-jeecg/src/permission.js

@@ -9,7 +9,7 @@ import { generateIndexRouter } from "@/utils/util"
 
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
 
-const whiteList = ['/user/login','/userequip/loginequip',
+const whiteList = ['/user/login','/userequip/loginequip','/user/sgin',
   '/userschedule/loginschedule','/usersimulation/loginsimulation','/userdroduction/logindroduction',
   '/userfitting/loginfitting','/userglobal/loginglobal','/userworkmanship/loginworkmanship','/userworkorder/loginworkorder',
   '/usermall/loginmall','/userbigdata/loginbigdata','/loginbx/loginbx','/userattendance/loginattendance','/userdata/logindata',