Merge remote-tracking branch 'origin/master'

cy

2023-11-30 0c31534172f689160c95a4ff61df11712b6890fe

 admin-web/src/views/departmentitem/itemscr/scrapping/index.vue

@@ -82,7 +82,7 @@
import myImport from '@/views/components/myImport';
import edit from './edit';
import detail from './detail';
import listPage from '../../../mixins/listPage'
import listPage from '@/views/mixins/listPage'

export default {
  name: 'index',