• libin's avatar
    Merge branch 'dev' into base-modify · ae4177a6
    libin authored
    # Conflicts:
    #	xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/MsgBiz.java
    #	xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/entity/ActivityBm.java
    #	xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/biz/ActivityBiz.java
    ae4177a6
Name
Last commit
Last update
..
xx-im-api Loading commit data...
xx-im-server Loading commit data...
pom.xml Loading commit data...