# Conflicts:
#	ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesRoleDetail.java
#	ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesRoleDetailMapper.xml
#	ruoyi-ui/src/views/system/suppliesroledetail/index.vue