1. 26 Sep, 2019 2 commits
    • 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
    • libin's avatar
      会员导入优化 · 719ea500
      libin authored
      719ea500
  2. 25 Sep, 2019 38 commits