# Conflicts: # src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
# Conflicts: # vite.config.js