From 20a063d6aada4dede9cf5a5921a0bcc885ef15df Mon Sep 17 00:00:00 2001
From: yys <47@gamerwa.com>
Date: Tue, 21 Apr 2026 11:05:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/system/AiUserMapper.xml        | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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}