Merge remote-tracking branch 'origin/4.2.60' into 4.2.60

m-im/src/main/java/com/yidianling/im/session/viewholder/MsgViewHolderLingxiAnswerQuestion.java

@@ -49,12 +49,14 @@ public class MsgViewHolderLingxiAnswerQuestion extends MsgViewHolderBase {
         itemBeans=customattachLingxiAnswerQuestion.answers;
         sb=new StringBuffer();
         for (int j=0;j<itemBeans.size();j++){
+            if (itemBeans.get(j).getOther()!=null){
                 if (itemBeans.get(j).getOther().trim().length()>0){
                     others= itemBeans.get(j).getOther();
                     isContainsOther=true;
                     break;
                 }
             }
+        }
         for (int i=0;i<itemBeans.size();i++){
             if (isContainsOther){
                 sb.append("#"+itemBeans.get(i).getName()+"  ");