瀏覽代碼

修改合并异常

shenzaixin 6 年之前
父節點
當前提交
ad84f3f530
共有 1 個文件被更改,包括 0 次插入5 次删除
  1. 0 5
      src/server/include/commons.js

+ 0 - 5
src/server/include/commons.js

@ -231,17 +231,12 @@ const DB_TABLES = {
            return DB_TABLES.GroupMessages;
        else if (sessionType == SESSION_TYPES.PRESCRIPTION)
            return DB_TABLES.MucMessages;
<<<<<<< .mine
        else if (sessionType == SESSION_TYPES.PRESCRIPTION_HOSPITAL)
            return DB_TABLES.MucMessages;
        else if (sessionType == SESSION_TYPES.ONDOOR_NURSING)
            return DB_TABLES.MucMessages;
=======
        else if (sessionType == SESSION_TYPES.SPECIALISTGROUP)
            return DB_TABLES.GroupMessages;
>>>>>>> .theirs
        else throw {message: "Unknown session type"};
    }
};