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

application/models/Business/Store/DeliveryService.php

@@ -137,10 +137,12 @@ class DeliveryServiceModel extends \Business\AbstractModel
         }
         if($res['isDel']==ApiConst::deleteStateOne){
             $updateData['is_del']=ApiConst::zero;
+            $updateData['true_name']=$trueName;
             $updateData['update_time']=TIMESTAMP;
             $deliveryManWhere['id']=$res['id'];
             $resData= $deliveryManDao->update($deliveryManWhere,$updateData);
             $memberData['diliveryman_id'] =$res['id'];
+            $resData=$res['id'];
         }else{
             $trueName=$trueName?$trueName:$member['memberName'];
             $deliveryManData['true_name']=$trueName;