gx

@@ -30,13 +30,6 @@ class WebSettingReceivingController extends BaseController
      */
      */
     public function save(WebSettingReceivingLogic $webSettingReceivingLogic){
     public function save(WebSettingReceivingLogic $webSettingReceivingLogic){
         $result = $webSettingReceivingLogic->setting_receiving_save();
         $result = $webSettingReceivingLogic->setting_receiving_save();
-<<<<<<< HEAD
-        if(!empty($result)){
-            $this->response('不符合规则的号码及邮箱:'.json_encode($result));
-        }
-        $this->response('success');
-=======
         $this->response('success',Code::SUCCESS,$result);
         $this->response('success',Code::SUCCESS,$result);
->>>>>>> 4564d1d1e6b7970219134a04864bdc7b707233c5
     }
     }
 }
 }