Merge branch 'master' of http://git.mingansei.com/xiaobai/equipment

.eslintrc.js

@@ -41,7 +41,7 @@ module.exports = {
     'curly': [2, 'multi-line'],
     'dot-location': [2, 'property'],
     'eol-last': 2,
-    'eqeqeq': [2, 'allow-null'],
+    'eqeqeq': [2, "always", { 'null': 'ignore' }],
     'generator-star-spacing': [2, {
       'before': true,
       'after': true