Merge branch 'feature-1.2.6' of http://192.168.1.220:10080/Amoy/im.doctor into feature-1.2.6

src/doctor/models/group.js

@@ -133,7 +133,7 @@ class GroupMessage extends BaseModel {
     */
    getMessages(groupId, memberId, contentType, msgStartId, msgEndId, count) {
        let self = this;
        gmRepo.findAllMessages(groupId, !contentType ? "1,2,3,5,6,8,9" : contentType, msgStartId, msgEndId, count, function (err, rows) {
        gmRepo.findAllMessages(groupId, !contentType ? "1,2,3,4,5,6,8,9" : contentType, msgStartId, msgEndId, count, function (err, rows) {
            if (err) {
                modelUtil.emitDbError(self.eventEmitter, 'Get group message failed', err);
                return;