Merge remote-tracking branch 'origin/master'

zhuzhuanzhuan

2023-12-26 ae3ad906ed4b09f72fc716957c4dbbe16341b38f

 src/views/base/WarehouseListNew.vue

@@ -150,7 +150,7 @@
        </div>
      </a-tab-pane>

      <a-tab-pane
      <!-- <a-tab-pane
        key="2"
        forceRender
      >
@@ -190,7 +190,7 @@
        >
          <service-object-list ref="EquipmentFileList"></service-object-list>
        </div>
      </a-tab-pane>
      </a-tab-pane> -->
    </a-tabs>
    <warehouse-modal
      ref="modalForm"