合并冲突处理

c751edcf · 吴贤德 · 8837d3f6 · c751edcf
Commit c751edcf authored Jul 30, 2019 by 吴贤德
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

UserAction.class.php SooonerHotel/App/Lib/Action/System/UserAction.class.php +1 -4

No files found.
--- a/SooonerHotel/App/Lib/Action/System/UserAction.class.php
+++ b/SooonerHotel/App/Lib/Action/System/UserAction.class.php
@@ -112,9 +112,7 @@ class UserAction extends CommonAction{
            $user["secret"]=$secret;
 			
 			$uid = $UserModel->add($user);
-<<<<<<< HEAD
-//            echo $UserModel->getLastSql();
-=======
+
            
            $SpUserMapModel->where("user_id = $uid")->delete();
            if($sp_ids){
@@ -125,7 +123,6 @@ class UserAction extends CommonAction{
                $SpUserMapModel->addAll($mapData);
            }
            
->>>>>>> 980ee345f9634e1754770ec7a03395b1e371512d
 			if($uid){
 				$role["role_id"]=I("role_id","",int);
 				$role["user_id"]=$uid;