Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-admin/src/main/resources/mapper/UserMapper.xml

@@ -87,7 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select <include refid="selectUserVo"/>
         from th_user
         <where>
-            <if test="1 == 1"> and mark = 1 and role_id != 1 </if>
+            <if test="1 == 1"> and mark = 1 </if>
             <if test="request.tenantId != null and request.tenantId != ''"> and tenant_id = #{request.tenantId} </if>
             <if test="request.username != null and request.username != ''"> and username like concat('%', #{request.username}, '%') </if>
             <if test="request.realname != null and request.realname != ''"> and realname like concat('%', #{request.realname}, '%') </if>