Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdc-front

yangys

2024-01-13 f466ae4fdc645c66c9f25e2e4598b9809e2b41af

 package.json

@@ -24,7 +24,9 @@
    "normalize.css": "7.0.0",
    "nprogress": "0.2.0",
    "postcss": "^7.0.27",
    "postcss-pxtorem": "^5.1.1",
    "qs": "^6.9.1",
    "table-merge-utils": "^1.0.3",
    "vue": "2.5.10",
    "vue-echarts": "^3.0.7",
    "vue-router": "3.0.1",