Merge branch 'master' into pgsqlDevelop

# Conflicts: # server/core/server_other.go
2021-11-19 22:25:12 +08:00
parent b88a1f91f7 a4f77cbc3d
commit 77a9b20346
4 changed files with 6 additions and 3 deletions
@@ -10,7 +10,7 @@
  </div>
 </template>
 <script>
-import echarts from 'echarts'
+import * as echarts from 'echarts'
 import { toRaw } from 'vue'
 import 'echarts/theme/macarons'