Merge branch 'pre' into 'feature-REQ/2129'

Browse Source

# Conflicts:
#   im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/AsyncSendMessageParam.java
#   im-center-server/src/main/java/cn/axzo/im/controller/PrivateController.java
#   im-center-server/src/main/java/cn/axzo/im/entity/MessageTask.java
#   im-center-server/src/main/java/cn/axzo/im/job/UpdateImAccountOuIdJob.java
#   im-center-server/src/main/java/cn/axzo/im/service/AccountRegisterService.java
#   im-center-server/src/main/java/cn/axzo/im/service/AccountService.java
#   im-center-server/src/main/java/cn/axzo/im/service/impl/MessageHistoryServiceImpl.java
#   im-center-server/src/main/java/cn/axzo/im/service/impl/MessageTaskServiceImpl.java

...

This commit is contained in:

李龙 2024-04-03 09:51:09 +00:00

parent 1fc56cd565 88d028251d

commit 4fb55ecdce

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available