Merge branch 'master' into pgsqlDevelop

# Conflicts:
#	server/core/server_other.go

web/src/view/dashboard/dashboardCharts/echartsLine.vue

@@ -10,7 +10,7 @@
   </div>
 </template>
 <script>
-import echarts from 'echarts'
+import * as echarts from 'echarts'
 import { toRaw } from 'vue'
 import 'echarts/theme/macarons'
 

web/src/view/superAdmin/api/api.vue

@@ -90,7 +90,7 @@
     </div>
 
     <el-dialog v-model="dialogFormVisible" :before-close="closeDialog" :title="dialogTitle">
-      <warning-bar title="新增API，需要在角色管理内篇日志权限才可使用" />
+      <warning-bar title="新增API，需要在角色管理内配置权限才可使用" />
       <el-form ref="apiForm" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="路径" prop="path">
           <el-input v-model="form.path" autocomplete="off" />