Merge remote-tracking branch 'origin/master'

无关风月

5 天以前 2fee40486f9473398be3c293e8311d45bd53adc9

 ruoyi-system/src/main/resources/mapper/system/TTaskMapper.xml

@@ -222,7 +222,7 @@
        group by t1.user_id,t1.template_id
    </select>
    <select id="pointInspectionHeatDetailTaskList" resultType="com.ruoyi.system.vo.system.TLocationTaskListVO">
        select t1.*,t2.nick_name as nickName,t2.phonenumber AS phoneNumber,t2.deptName,t2.deptId
        select t1.*,t2.nick_name as nickName,t2.phonenumber AS phoneNumber,t2.deptName,t2.deptId,t2.deptType
        from t_task t1
        left join sys_user t2 on t1.user_id = t2.user_id
        <where>