# Conflicts:
#	ruoyi-ui/src/views/system/ActSuppliesDetails/ActSuppliesDetails/index.vue
#	ruoyi-ui/src/views/system/Actsupplies/Actsupplies/index.vue
#	ruoyi-ui/src/views/system/suppliesrole/index.vue
#	ruoyi-ui/src/views/system/suppliesroledetail/index.vue