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

application/controllers/Message.php

@@ -153,6 +153,7 @@ class MessageController extends \Our\Controller_AbstractApi {
     }
 
     public function getSetAction(){
+        echo 23424;exit;
         $memberCenterService=\Business\User\MemberCenterServiceModel::getInstance();
         $messageSet=$memberCenterService->getMessageSet($this->memberId);
         if(!empty($messageSet)){

application/models/Business/Message/MessageService.php

@@ -12,7 +12,7 @@ use Our\ArrayConst;
 use Our\Common;
 use Our\DbNameConst;
 use Our\ImageConst;
-use Zend\Json\Server\Error;
+
 
 
 /**