Merge branch 'master-modify-cutAmount' into dev

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

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

@@ -325,11 +325,10 @@ public class MsgBiz {
     public Integer getNumber() {
         Integer number = 0;
         Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
-        log.info("查询字典表的结果为： dictionaryMap = {}", dictionaryMap);
         if (MapUtils.isNotEmpty(dictionaryMap)) {
             Dictionary dictionary = dictionaryMap.get(IM_TYPE + "_" + DictionaryKey.MSG_LIMIT_NUMBER);
-            log.info("查询IM限制数为字典表的结果为： dictionary = {}", dictionary.toString());
             if (dictionary != null && StringUtils.isNotBlank(dictionary.getDetail())) {
+                log.info("查询IM限制数为字典表的结果为： dictionary = {}", dictionary.toString());
                 number = Integer.parseInt(dictionary.getDetail());
             }
         }