Merge branch 'master' of https://github.com/chuzhixin/vue-admin-beautiful

.gitignore

@@ -5,6 +5,7 @@ dist
 .env.local
 .env.*.local
 npm-debug.log*
+yarn.lock
 yarn-debug.log*
 yarn-error.log*
 .idea

src/utils/encrypt.js

-import { JSEncrypt } from 'jsencrypt/bin/jsencrypt.min'
+import JSEncrypt from 'jsencrypt'
 import { getPublicKey } from '@/api/publicKey'
 
 const privateKey =