Merge remote-tracking branch 'origin/dev_New_pro' into dev_宁夏_英泽防锈

liyong

5 天以前 f57064d2fa563ee4cfeeccd715850ba8b8aa4f60

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

@@ -95,8 +95,6 @@
         SELECT user_id FROM sys_user_dept WHERE dept_id = #{deptId}
         )
      </if>
      <!-- 数据范围过滤 -->
      ${params.dataScope}
   </select>

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