Merge branch 'talksec' of 121.43.114.153:/home/git/repositories/shopnc into talksec

data/model/room.model.php

@@ -54,12 +54,12 @@ class roomModel extends Model
         return $this->table('room_msg')->field('*')->where(['room_id' => $room_id, 'type' => $msg_type])->order('add_time desc')->select();
     }
 
-    public function getRoomMsgList($condition, $pagesize = '', $field = '*', $order = 'msg_id desc',$master = false)
+    public function getRoomMsgList($condition, $pagesize = '', $field = '*', $order = 'msg_id asc',$master = false)
     {
         return $this->table('room_msg')->field($field)->where($condition)->order($order)->limit($pagesize)->master($master)->select();
     }
 
-    public function getChatwoMsgList($condition, $pagesize = '', $field = '*', $order = 'msg_id desc',$master = false)
+    public function getChatwoMsgList($condition, $pagesize = '', $field = '*', $order = 'msg_id asc',$master = false)
     {
         return $this->table('room_chatwo_msg')->field($field)->where($condition)->order($order)->limit($pagesize)->master($master)->select();