Merge branch 'master' into deploy

# Conflicts: # src/views/login.vue
2022-08-02 13:30:35 +08:00
parent 183c0c5acf b0b39d228a
commit 54bbf6d1fb
3 changed files with 4 additions and 4 deletions
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "eladmin-web",
  "version": "2.6.0",
-  "description": "EL-ADMIN 前端源码",
+  "description": "ELADMIN 前端源码",
  "author": "Zheng Jie",
  "license": "Apache-2.0",
  "scripts": {