Merge branch 'dev_New' into dev_New_kthg

zss

2026-02-06 d5dc454e86e78abd6ca859bb9b0a4c096d743b3b

 src/main/resources/mapper/system/SysUserMapper.xml

@@ -88,7 +88,7 @@
      <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
         AND date_format(u.create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
      </if>
      <if test="params.deptId != null">
      <if test="deptId != null">
         AND u.user_id IN
         (
         SELECT user_id FROM sys_user_dept WHERE dept_id = #{deptId}