合并样式冲突优化处理

a9d31ad8 · chengxiang.li · 4b556354 · a9d31ad8 · a9d31ad8
--- a/assets/style/index.less
+++ b/assets/style/index.less
@@ -507,4 +507,5 @@
            height: 25px;
        }
    }
-}
+  }
+}
\ No newline at end of file
--- a/package-lock.json
+++ b/package-lock.json