Merge remote-tracking branch 'origin/master'

zss

2023-12-12 6371e0890178fe1fdd9c36f72373a141add90d92

 src/views/warehouse/stock/index.vue

@@ -333,7 +333,7 @@
          {
            minWidth: '100',
            prop: 'ifsBatchNo',
            label: 'IFS批次号',
            label: '批次号',
            sort: true,
            isTrue: true,
            isSearch: true,