处理冲突

common/helpers/user/Info.php

@@ -640,11 +640,8 @@ class Info {
     }
 
     /**
-<<<<<<< Updated upstream
-     * 获取用户ID
-=======
      * 获取Ba用户ID
->>>>>>> Stashed changes
+
      * @param $userName
      * @return mixed
      */
@@ -652,7 +649,6 @@ class Info {
         $user = BaUserInfo::findOneAsArray('USER_NAME=:USER_NAME AND DELETED=0', [':USER_NAME' => $userName], 'USER_ID');
         return $user ? $user['USER_ID'] : null;
     }
-<<<<<<< Updated upstream
 
     /**
      * 获取会员名通过ID
@@ -721,6 +717,4 @@ class Info {
     public static function getBaBaseUserByUserName($username) {
         return BaUser::findOneAsArray('USER_NAME=:USER_NAME', [':USER_NAME' => $username]);
     }
-=======
->>>>>>> Stashed changes
 }