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

sub-operation-service/src/layouts/component/Main/index.vue

@@ -1,5 +1,5 @@
 <!--
- * @Description: 
+ * @Description:
  * @Author: zenghua.wang
  * @Date: 2023-06-20 14:29:45
  * @LastEditors: zenghua.wang
@@ -34,7 +34,7 @@ const isReload = computed(() => SettingStore.isReload);
   flex: 1;
   display: flex;
   width: 100%;
-  height: 100%;
+  height: fit-content;
   @include scrollable;
 
   box-sizing: border-box;