Merge remote-tracking branch 'origin/master'

liusheng

2 天以前 da026a34bcc97b2eb49607a3b02d94d8f683f997

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

@@ -44,8 +44,8 @@
    <select id="selectServiceTaskdiagList" parameterType="com.smartor.domain.ServiceTaskdiag"
            resultMap="ServiceTaskdiagResult">
        <include refid="selectServiceTaskdiagVo"/>
        <where>
            del_flag=0
        where 1=1
            and del_flag = 0
            <if test="taskId != null ">
                and task_id = #{taskId}
            </if>
@@ -79,7 +79,6 @@
            <if test="pid != null ">
                and pid = #{pid}
            </if>
        </where>
    </select>

    <select id="selectServiceTaskdiagById" parameterType="Long"