# Conflicts:
#	core/src/main/java/com/wecloud/im/service/ImConversationService.java

2、群设置入参修改

# Conflicts:
#	core/src/main/java/com/wecloud/im/service/impl/ImConversationServiceImpl.java