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/main

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

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

pom.xml

fix:

2023-07-16 22:51:52 +08:00