Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into lyz

application/models/Business/User/MemberCenterService.php

@@ -62,12 +62,14 @@ class MemberCenterServiceModel extends \Business\AbstractModel
                 'canPush'=>(int)$pushSet['canPush'],
                 'sound'=>(int)$pushSet['sound'],
                 'vibrate'=>(int)$pushSet['vibrate'],
+                'timeDiff'=>$pushSet['timeDiff'],
             );
         }else{
             $pushSet=array(
                 'canPush'=>ApiConst::openMessae,
                 'sound'=>ApiConst::openMessae,
                 'vibrate'=>ApiConst::openMessae,
+                'timeDiff'=>'',
             );
         }
         return $pushSet;

application/models/DAO/MessageOne.php

@@ -80,7 +80,7 @@ class MessageOneModel extends \DAO\AbstractModel {
         }
         parent::setDb();
         $where=Common::format(" fromId={0} or toId={1}",$memberId,$memberId);
-        $messages=$this->lists($where,'',$field,$pageIndex,$pageSize);
+        $messages=$this->lists($where,array('gmtUpdate'=>'desc'),$field,$pageIndex,$pageSize);
         return $messages;
     }
     public function update($data,$where=array()){