# Conflicts:
#	ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesTemplate.java
#	ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesRoleDetailMapper.java
#	ruoyi-ui/src/views/system/supplies/index_template.vue
#	ruoyi-ui/src/views/system/suppliesrole/index.vue
#	ruoyi-ui/src/views/system/suppliesroledetail/index.vue