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

徐旺旺

2021-03-30 eb6674449920c5452811feee3d82f6c6b965089d

 .eslintrc.js

@@ -1,7 +1,8 @@
module.exports = {
  root: true,
  env: {
    node: true
    node: true,
    amd: true
  },
  extends: [
    'plugin:vue/essential',