diff --git a/web-api/ruoyi-system/src/main/resources/mapper/system/AiUserMapper.xml b/web-api/ruoyi-system/src/main/resources/mapper/system/AiUserMapper.xml
index ae0a1d2..8e65e3c 100644
--- a/web-api/ruoyi-system/src/main/resources/mapper/system/AiUserMapper.xml
+++ b/web-api/ruoyi-system/src/main/resources/mapper/system/AiUserMapper.xml
@@ -87,17 +87,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select count(1) from ai_user where del_flag = '0' and dept_id = #{deptId}
     </select>
 
-<<<<<<< HEAD
     <select id="selectAiUserIdsByDeptId" resultType="java.lang.Long">
         select id from ai_user where del_flag = '0' and dept_id = #{deptId}
-=======
+    </select>
+
     <select id="countNormalAiUsersByDeptId" resultType="int">
         select count(1) from ai_user
         where del_flag = '0' and status = 0 and dept_id = #{deptId}
         <if test="excludeUserId != null">
             and id != #{excludeUserId}
         </if>
->>>>>>> origin/seedance_balance
     </select>
     <select id="selectPasswordById" resultType="java.lang.String">
         select password from ai_user where id = #{id}