Merge remote-tracking branch 'origin/3.0.1' into 3.0.1

rk

昨天 609a1931953b2298016bd2b0d6b410666b5ad7b9

 admin/package.json

@@ -4,6 +4,7 @@
  "private": true,
  "scripts": {
    "serve": "vue-cli-service serve",
    "servePro": "vue-cli-service serve  --mode production",
    "dev": "vue-cli-service serve",
    "build:pro": "vue-cli-service build",
    "build:dev": "vue-cli-service build --mode staging",
@@ -21,6 +22,7 @@
    "@wangeditor/editor-for-vue": "^1.0.2",
    "axios": "^0.21.1",
    "core-js": "^3.6.5",
    "dayjs": "^1.11.13",
    "echarts": "^5.4.2",
    "ele-calendar": "^2.0.0",
    "element-ui": "^2.15.13",
@@ -60,34 +62,17 @@
    "env": {
      "node": true
    },
    "extends": [
      "plugin:vue/essential",
      "@vue/standard"
    ],
    "extends": [],
    "parserOptions": {
      "parser": "babel-eslint"
    },
    "rules": {
      "indent": [
        "error",
        2
      ],
      "generator-star-spacing": "off",
      "no-debugger": "error"
    }
    "rules": {}
  },
  "browserslist": [
    "> 1%",
    "last 2 versions",
    "not dead"
  ],
  "gitHooks": {
    "pre-commit": "lint-staged"
  },
  "lint-staged": {
    "*.{js,jsx,vue}": [
      "vue-cli-service lint",
      "git add"
    ]
  }
  "gitHooks": {},
  "lint-staged": {}
}