# Conflicts:
#	src/main/java/cn/quantgroup/cashloanflowboss/api/channel/controller/ChannelConfController.java
#	src/main/java/cn/quantgroup/cashloanflowboss/api/log/service/LogService.java
#	src/main/java/cn/quantgroup/cashloanflowboss/api/role/entity/boss/RoleUser.java
#	src/main/java/cn/quantgroup/cashloanflowboss/api/role/service/RoleService.java