Merge branch 'gaoying' into 'dev'

Gaoying

See merge request !45

quality-review/src/main/resources/mapper/TaskUserRelationMapper.xml

@@ -5,15 +5,14 @@
 <mapper namespace="com.ruoyi.mapper.TaskUserRelationMapper">
 
     <resultMap id="BaseResultMap" type="com.ruoyi.domain.TaskUserRelation">
-            <result property="taskId" column="task_id" jdbcType="BIGINT"/>
-            <result property="userId" column="user_id" jdbcType="BIGINT"/>
-            <result property="isLeader" column="is_leader" jdbcType="TINYINT"/>
-            <result property="name" column="name" jdbcType="VARCHAR"/>
-            <result property="deptName" column="dept_name" jdbcType="VARCHAR"/>
+        <result property="taskId" column="task_id" jdbcType="BIGINT"/>
+        <result property="userId" column="user_id" jdbcType="BIGINT"/>
+        <result property="isLeader" column="is_leader" jdbcType="TINYINT"/>
+        <result property="name" column="name" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-        task_id,user_id,is_leader,name,dept_name
+        select task_id,user_id,is_leader,name from t_task_user_relation
     </sql>
 
     <select id="selectQTeamMembers" parameterType="Long" resultMap="BaseResultMap">
@@ -23,4 +22,4 @@
             task_id = #{taskId}
         </if>
     </select>
-</mapper>
+</mapper>
\ No newline at end of file