Merge branch 'master' into develop

zenglf

2023-09-28 8e75a78f55d60565eb48b25eafd4eb07939ce2cc

 src/views/eam/EquipmentCategoryList.vue

@@ -4,16 +4,16 @@
    :gutter="16"
  >
    <a-col
      :md="6"
      :md="5"
      :sm="24"
    >
      <equipment-category-left />
      <equipment-category-left/>
    </a-col>
    <a-col
      :md="24-6"
      :md="24-5"
      :sm="24"
    >
      <equipment-category-right />
      <equipment-category-right/>
    </a-col>
  </a-row>
</template>