Merge remote-tracking branch 'origin/master'

xiangpei

2024-05-23 161d73fef78ab215077a5f1e87d8b586f29c764f

 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">