From 161d73fef78ab215077a5f1e87d8b586f29c764f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 23 五月 2024 16:21:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/resources/mapper/UserMapper.xml |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
index 5d3b1b3..68d3dfc 100644
--- a/src/main/resources/mapper/UserMapper.xml
+++ b/src/main/resources/mapper/UserMapper.xml
@@ -469,11 +469,10 @@
   </update>
 
   <update id="setStatus">
-    UPDATE t_user
-    SET `condition`        = #{condition},
-        `condition_detail` = #{conditionDetail}
-    WHERE id = #{id}
-    AND deleted = 0
+      UPDATE t_user
+      SET `condition` = #{condition}
+      WHERE id = #{id}
+        AND deleted = 0
   </update>
 
     <update id="clearDeptAdmin">

--
Gitblit v1.8.0