From 2d5e75bbc04d8c4c5c7dc6bb141ad16ffa2d9936 Mon Sep 17 00:00:00 2001
From: XingChuan <m17600301067@163.com>
Date: 星期日, 30 五月 2021 12:24:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 .eslintrc.js |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 654134e..e1f5352 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,7 +1,8 @@
 module.exports = {
   root: true,
   env: {
-    node: true
+    node: true,
+    amd: true
   },
   extends: [
     'plugin:vue/essential',
@@ -12,7 +13,9 @@
   },
   rules: {
     'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
-    'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off'
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
+    'new-cap': 'off'
+    //'camelcase': 'error'
   },
   overrides: [
     {

--
Gitblit v1.8.0