limeng 21e9c91287 Merge remote-tracking branch 'origin/friend' into friend ...

# Conflicts:
#	mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/UserApplyDao.java
#	mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/UserFriendDao.java
#	mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/FriendServiceImpl.java

2023-07-23 11:27:55 +08:00

..

src

Merge remote-tracking branch 'origin/friend' into friend

2023-07-23 11:27:55 +08:00

pom.xml

Merge branch 'main' into chat_context

2023-07-10 22:46:20 +08:00