# Conflicts: # ruoyi-admin-vue/src/api/inventory/inventory.js # ruoyi-admin-vue/src/views/inventory/materials/index.vue
