Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	openhis-ui-vue3/src/store/modules/settings.js

openhis-ui-vue3/src/store/modules/settings.js

@@ -2,7 +2,7 @@ import defaultSettings from '@/settings'
 import {useDynamicTitle} from '@/utils/dynamicTitle'
 
 const {
-  sideTheme, showSettings, topNav, tagsView, tagsViewPersist,
+  sideTheme, showSettings, navType: topNav, tagsView, tagsViewPersist,
   tagsIcon, tagsViewStyle, fixedHeader, sidebarLogo, dynamicTitle,
   footerVisible, footerContent
 } = defaultSettings
@@ -29,14 +29,14 @@ const useSettingsStore = defineStore(
       footerContent: storageSetting.footerContent === undefined ? footerContent : storageSetting.footerContent
     }),
     actions: {
-      // ??????
+      // 修改布局设置
       changeSetting(data) {
         const { key, value } = data
         if (this.hasOwnProperty(key)) {
           this[key] = value
         }
       },
-      // ??????
+      // 设置网页标题
       setTitle(title) {
         this.title = title
         useDynamicTitle();