• hongguangwu's avatar
    Merge branch 'MVP-1.7.7-Friend' into MVP1.7.8 · 2326044f
    hongguangwu authored
    # Conflicts:
    #	yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/config/SocialFriendConfig.java
    #	yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFriendPushServiceImpl.java
    #	yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialInfoMapper.xml
    2326044f
TSocialInfoMapper.xml 39.9 KB