Merge remote-tracking branch 'origin/master'

liusheng

6 天以前 36c95e19d39eb855c7a3ae23b4468d5cd3cb88ed

 smartor/src/main/resources/mapper/smartor/ServiceTaskdiagMapper.xml

@@ -45,6 +45,7 @@
            resultMap="ServiceTaskdiagResult">
        <include refid="selectServiceTaskdiagVo"/>
        <where>
            del_flag=0
            <if test="taskId != null ">
                and task_id = #{taskId}
            </if>