Merge branch 'master-modify-cutAmount' into dev

# Conflicts: # xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/MsgBiz.java

Merge branch 'master-modify-cutAmount' into dev
# Conflicts: # xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/MsgBiz.java
83dda54e · jiaorz · f96b9023 · 2915aff5 · 83dda54e
Commit 83dda54e authored Sep 25, 2019 by jiaorz
Show whitespace changes
Inline Side-by-side

Showing with 12 additions and 12 deletions

MsgBiz.java ...server/src/main/java/com/xxfc/platform/im/biz/MsgBiz.java +12 -12

No files found.
--- a/xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/MsgBiz.java
+++ b/xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/MsgBiz.java