Merge remote-tracking branch 'origin/master'

liusheng

6 天以前 36c95e19d39eb855c7a3ae23b4468d5cd3cb88ed

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

@@ -173,8 +173,8 @@
            </if>
        </trim>
        <where>
        <if test="id != null">and id = #{id},</if>
        <if test="taskId != null">and task_id = #{taskId},</if>
        <if test="id != null">and id = #{id}</if>
        <if test="taskId != null">and task_id = #{taskId}</if>
        </where>
    </update>

@@ -193,8 +193,8 @@
            update_time = sysdate()
        </trim>
        <where>
            <if test="id != null">and id = #{id},</if>
            <if test="taskId != null">and task_id = #{taskId},</if>
            <if test="id != null">and id = #{id}</if>
            <if test="taskId != null">and task_id = #{taskId}</if>
        </where>
    </update>