Merge branch 'master-where标签替换'

陈昶聿

3 天以前 d2d33d9e10b6a68b84a43a1b970a94246ffdf801

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

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

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