Merge branch 'refs/heads/dev_New_pro' into dev_宁夏_英泽防锈

云

3 天以前 620bb4712a31791231c4381581f0f60088f079fe

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

@@ -95,9 +95,7 @@
         SELECT user_id FROM sys_user_dept WHERE dept_id = #{deptId}
         )
      </if>
      <!-- 数据范围过滤 -->
      ${params.dataScope}
      ORDER BY u.create_time DESC
        ORDER BY u.create_time DESC
   </select>

   <select id="selectAllocatedList" parameterType="com.ruoyi.project.system.domain.SysUser" resultMap="SysUserResult">