Skip to content

C
cloud-platform
Switch branch/tag
  1. 26 Sep, 2019 3 commits
    • libin's avatar
      Merge remote-tracking branch 'origin/base-modify' into base-modify · 3e7d660b
      libin authored 
      # Conflicts:
#	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
      3e7d660b
    • 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
  3. 25 Sep, 2019 37 commits